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