Develop: 1 fix (SaveAsNew) and one small improvement.

See embedded commits. 
No need for a hectic new release - I have some more small fixes in mind...

(I don'tn know why your own commit also shows up?
This was simply my upstream fetch of your change to my fork...)

Greetings: WOK.