Merge branch 'master' into issue1716.