Removed requirement for empty template
Merge branch 'master' into gh-pages

* master:
  Removed requirement for empty template