Merge branch 'release/v1'
eveil jason
Merge branch 'hotfix/jasonisbadwithnames' into develop