Update to check local fork update
Merge remote-tracking branch 'upstream/master'