Master-public to master

Initial pull request to see a diff. Please don't pull yet, want to do a review myself.