Updating: generally improving
Updating: keeping the code up-to-date
Updating: generally improving
Updating: very minorly improving
Updating: minorly tidying-up
Merge remote-tracking branch 'refs/remotes/upstream/master'