Merge pull request #3377 from jlblancoc:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:56:22 +0000 (14:56 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 14:56:23 +0000 (14:56 +0000)

Trivial merge