Merge branch 'release/v0.3.2'
Merge branch 'master' of github.com:ptdavteam/bridle
Merge branch 'hotfix/v0.3.3'
fixes
fix conflicts
fix conflicts
conflict fix
Merge branch 'release/v0.3.6'
Merge branch 'release/v0.3.7'
Merge branch 'release/0.3.8'
Merge branches 'master' and 'master' of github.com:pearson-enabling-technologies/bridle
Merge branch 'master' into develop