Minor source fix
Merge branch 'master' into composite