Merge pull request #3389 from blackibiza84:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:58:27 +0000 (14:58 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:58:27 +0000 (14:58 +0000)

Trivial merge