Fix demo re #200
Merge branch '1.8' into 1.9
Merge branch '1.9' into 1.10
Changelog re #200