ಠ_ಠ

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