closes #699
Merge branch 'develop' of gitlab.trommons.org:solas-match into develop