Updating: very minorly tidying-up
Merge remote-tracking branch 'upstream/master'