Merged patch from #318
Merge branch 'master' of github.com:phiamo/MopaBootstrapBundle