Merge pull request #7020 from StevenPuttemans:add_scale_option
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 Aug 2016 13:37:29 +0000 (13:37 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 Aug 2016 13:37:29 +0000 (13:37 +0000)

Trivial merge