Merge pull request #4007 from martin-ueding:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:35:09 +0000 (11:35 +0000)

Trivial merge