Merge pull request #4017 from headupinclouds:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 14 May 2015 18:16:23 +0000 (18:16 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 14 May 2015 18:16:23 +0000 (18:16 +0000)

Trivial merge