Merge pull request #3067 from vpisarev:minor_fixes2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 10 Aug 2014 10:52:57 +0000 (10:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 10 Aug 2014 10:52:57 +0000 (10:52 +0000)

Trivial merge