Merge master into development

I accidentally committed directly to master again