Pulling in changes from master branch...hopefully I didn't forget anything.