Merge master

Merging in upstream changes to our branch.