Merge branch 'hotfix/noperiod'
File insensitive OSX bug
Merge branch 'hotfix/creationsbug' into develop