Update stuff
Merge branch 'master' into colorpicker