Merge pull request #874 from DaveMC08/feature/fixes_ci_2.1.4

Update CI to version 2.1.4
Merge branch 'develop' of https://github.com/ci-bonfire/Bonfire into develop