Merge branch 'master' into issue-70