Re-add sandbox variable to update hook
Added comment to makefile patch
Merge remote-tracking branch 'origin' into release