Merge master, pending conflicts are resolved