Copyright was messing up mask
Merge branch 'mask-hack2'

* mask-hack2:
  Copyright was messing up mask