Merge remote-tracking branch 'official/master'

* official/master:
  FeinCMS v1.6.6
Merge branch 'master' into next

* master: