Merge branch 'master' into iss50
Merge branch 'master' into iss51