Merge branch 'fix_MATH-1458'
authorGilles <erans@apache.org>
Tue, 8 May 2018 15:49:12 +0000 (17:49 +0200)
committerGilles <erans@apache.org>
Tue, 8 May 2018 15:49:12 +0000 (17:49 +0200)
Closes #85


Trivial merge