Merge pull request #1079 from ci-bonfire/develop

0.7.1 Release
Merge pull request #1084 from ci-bonfire/master

Merge pull request #1079 from ci-bonfire/develop