Merge branch 'master' into Issue#48