Merge branch 'master' into issue#359