Bringing develop up to date with master.

I should've done these changes on develop but here we are.