Upstream bugfixes

Albert Gräfrequested to merge
(removed):upstream-bugfixes into master

Ico's two latest commits from upstream with bugfixes for intelligent patching and preset saving logic.

Merge request reports