Merge branch 'release/0.6.0'
Merge branch 'release/0.7.0'
ಠ_ಠ

Sometimes it helps to actually make the changes you meant to commit.
Merge branch 'hotfix/0.7.1' into develop