Merge pull request #1 from ci-bonfire/develop