Merge master into your refactor branch

Trying again here. Merged master into your refactor branch.