Merge branch 'panlord-colour'