Master into Develop

This cleans up a bit of conflict between master and develop