Merge branch 'hotfix/0.1.1'
Another VERSION hotfix, too tired for this today...
Merge branch 'hotfix/0.1.2' into develop