Follow up on 00ee7307fa5b25ce83753cea6df136558cec9f6c, forgot a (double)
Merge remote-tracking branch 'origin/master' into 2d-gui