The dark background bled over the input all nasty
Merge remote-tracking branch 'upstream/2.2/develop' into projects/cardworld/develop