Merge pull request #4027 from zenev:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 12:35:17 +0000 (12:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 21 May 2015 12:35:17 +0000 (12:35 +0000)

Trivial merge