Fixed syntax error that'll allow demo to work again.
Merge branch 'master' into gh-pages