Merge upstream v1.0.x

There have been various commits to upstream v1.0.x (roughly equivalent to master) which are probably useful for us too, especially you since it should make things easier on a Mac.
Besides that, it's basically a pre-requisite when we want to merge the v1.1.x upstream branch