Rebase up

This is a fully git pull --rebase upstream master branch.