Merge branch 'develop' into beta

New "postpone G13 speedy deletion" option, plus bugfixes and code
optimization.