Combine all of the compatible contributions into a working branch to allow easy review and continued work on the issue.
Please "fix conflicts+rebase 2.0.x" instead of merging in 2.0.x to avoid breaking history to a point that automated rebase no longer works.
