Catch up to current developments

We should merge all changes from the past month into our fork...unless there is a compelling reason not to.