Fix background template error
Merge branch 'refs/heads/develop' into gh-pages