Am-I-part-of-an-RGB logic wasn't quite right [1540]
Merge remote-tracking branch 'upstream/master'

Merging with master [0]