fixes #956
Merge branch 'master' into feature_507_snippets