Deleting temporaries
Merge branch 'develop'