remove ampersand on 279 that makes the err with 3.6
Merge branch 'master' into theme-mode.child-mode

* master:
  remove ampersand on 279 that makes the err with 3.6