Merge pull request #2856 from sanchom:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 14:22:55 +0000 (14:22 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 2 Jul 2014 14:22:56 +0000 (14:22 +0000)

Trivial merge