Merge pull request #5344 from psalvaggio:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Sep 2015 11:53:41 +0000 (11:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Sep 2015 11:53:41 +0000 (11:53 +0000)

Trivial merge