Merge pull request #5983 from pra85:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jan 2016 10:51:21 +0000 (10:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Jan 2016 10:51:21 +0000 (10:51 +0000)

Trivial merge