Pull latest changes

Should be merge-able this time, I hope.