Updated update code YET again.
Merge remote-tracking branch 'upstream/master'