Merge branch 'hotfix-1.0.1' into develop
Merge branch 'develop' of https://github.com/jcw-/MiningController