Merge branch 'release/1.0'
Screw you vim!
Merge branch 'hotfix/1.0.1' into develop