Merge branch 'master' into pluggable-renderer