Merge branch 'master' into iss51