Merge branch 'master', remote-tracking branch 'origin'
Note to self: Test your code.
Lots of operations.