v1.5 Demo changes - completion
Merge branch 'master' into gh-pages