Merge pull request #3081 from akarsakov:small_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Aug 2014 10:50:33 +0000 (10:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Aug 2014 10:50:33 +0000 (10:50 +0000)

Trivial merge