Release 1.1.5
Merge remote-tracking branch 'origin' into fix-broken-save