Merge branch 'Baldoph-performance' of https://github.com/RSully/RSColorPicker into performance