Merge master branch - resolved conflicts, fixed goo-update failures on delete.