Merge branch 'master' into example-fixes