Merge pull request #3018 from fradelg:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 1 Aug 2014 13:06:36 +0000 (13:06 +0000)

Trivial merge