Merge branch 'release/0.1.8'
Merge branch 'master' of git://github.com/Axxon/CommonBundle into Axxon-develop
Merge branch 'Axxon-develop' into develop
Merge branch 'develop' of github.com:black-project/CommonBundle into develop