Merge pull request #7282 from alalek:fix_calculations
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 15:05:42 +0000 (15:05 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Oct 2016 15:05:42 +0000 (15:05 +0000)

Trivial merge