Merge branch 'master' into release-10 in order to update the master

branch to reflect recent changes.
The updated master branch is described in the GMD paper by Pisso et al.
(2019)