Update from psake:master

Lots of pull requests have been merges into master.