Pull latest development updates

Exactly as it says on the tin.