Merge branch 'feature_MATH-1459'
authorGilles <erans@apache.org>
Wed, 16 May 2018 14:16:50 +0000 (16:16 +0200)
committerGilles <erans@apache.org>
Wed, 16 May 2018 14:16:50 +0000 (16:16 +0200)
Closes #84


Trivial merge