Wrong freaking sub mod survived the merge
Merge branch 'release' into gh-pages

* release:
  Wrong freaking sub mod survived the merge