CR #238
Merge branch 'master' into superproject