all demos work again now
Merge branch 'master' into 1.x