Merge in upstream, add colour-picker.