fixes #302 oops
Merge branch 'master' into feature_759_cleanup