Merge branch 'master' into hls-color-tweak