Mask mode bugfix
Merge branch 'unstable-jumbo' into bleeding-jumbo

# By JimF
* unstable-jumbo:
  Mask mode bugfix