Merge pull request #3589 from JBosch:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Jan 2015 10:46:53 +0000 (10:46 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Jan 2015 10:46:53 +0000 (10:46 +0000)

Trivial merge