Merge pull request #4081 from vpisarev:30_small_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 2 Jun 2015 08:36:03 +0000 (08:36 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 2 Jun 2015 08:36:03 +0000 (08:36 +0000)

Trivial merge