Allarmed about the V1 update site currently being unavailable
Merge remote branch 'upstream/master'