Merge remote-tracking branch 'origin/master' into updates

Conflicts:
It looks like you may be committing a merge.
If this is not correct, please remove the file
and try again.

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch updates
Your branch is up to date with 'origin/updates'.
All conflicts fixed but you are still merging.

Author: SheepTester