Merge branch 'hotfix/0.2.5'
Re-enabling OSX and bumping version
Merge branch 'hotfix/0.2.6' into develop