Merge remote-tracking branch 'origin/master' into diff-cleanup
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 18 Jun 2015 14:52:56 +0000 (17:52 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 18 Jun 2015 14:52:56 +0000 (17:52 +0300)

Trivial merge