Merged upstream. Fixed conflicts manually.