Merge branch 'color-picker' into 'master'