Merged stuff from upstream/master