Commit 1b740a00761f5f14200d6d60cec8fa416b2fcbde

Alexei Podtelezhnikov 2015-12-02T00:30:57

Minor rearrangement.