Issue #328 revisited.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Issue #328 revisited.