Merge back from develop

Yeesh, for a moment I thought this did something