Merge in upstream master branch