Some more
Merge branch 'master' into iss53