Bug fix for conflict with core colour picker
Merge tag '2.0.1'

Tagging version 2.0.1