Updates to head

These were previously present on the upstream 0.8.1 integration branch.  I've separated them from the version-bump commit so that they may be tested and applied separately.  They've previously all been reviewed / acked, however much was changed during the rebase onto 0.7.8.