Merge branch 'merge' of https://github.com/Elorfin/CoreBundle