[Software update] Fix 'view changes', thanks Andy.
Merge remote-tracking branch 'origin/master'