Merge branch 'master' into issue_157