Manually merged origin/master.
Manually merged origin/master.

Thijzer/forkcms,lowiebenoot/forkcms,vytenizs/forkcms,jacob-v-dam/forkcms,jessedobbelaere/forkcms,riadvice/forkcms,jonasdekeukelaere/forkcms,carakas/forkcms,DegradationOfMankind/forkcms,sumocoders/forkcms,lowiebenoot/forkcms,matthiasmullie/forkcms,jessedobbelaere/forkcms,wengyulin/forkcms,vytenizs/forkcms,riadvice/forkcms,jeroendesloovere/forkcms,DegradationOfMankind/forkcms,Saxithon/gh-pages,riadvice/forkcms,justcarakas/forkcms,Thijzer/forkcms,mathiashelin/forkcms,jessedobbelaere/forkcms,sumocoders/forkcms,ocpyosep78/forkcms,bartdc/forkcms,ocpyosep78/forkcms,Katrienvh/forkcms,jacob-v-dam/forkcms,wengyulin/forkcms,WouterSioen/forkcms,carakas/forkcms,forkcms/forkcms,riadvice/forkcms,jonasgoderis/jonaz,tommyvdv/forkcms,jacob-v-dam/forkcms,ikoene/forkcms,Saxithon/gh-pages,jonasdekeukelaere/forkcms,gertjanmeire/davy_portfolio,jonasgoderis/jonaz,nosnickid/forkcms,jonasdekeukelaere/forkcms,jonasdekeukelaere/forkcms,bartdc/forkcms,mathiashelin/forkcms,forkcms/forkcms,jacob-v-dam/forkcms,sumocoders/forkcms,Katrienvh/forkcms,jonasgoderis/jonaz,wengyulin/forkcms,gertjanmeire/davy_portfolio,carakas/forkcms,mathiashelin/forkcms,tommyvdv/forkcms,sumocoders/forkcms,Katrienvh/forkcms,DegradationOfMankind/forkcms,tommyvdv/forkcms,Thijzer/forkcms,jonasgoderis/jonaz,carakas/forkcms,sumocoders/forkcms,WouterSioen/forkcms,jonasgoderis/jonaz,jessedobbelaere/forkcms,dmoerman/forkcms,vytenizs/forkcms,jonasdekeukelaere/forkcms,nosnickid/forkcms,mathiashelin/forkcms,jeroendesloovere/forkcms,jeroendesloovere/forkcms,matthiasmullie/forkcms,dmoerman/forkcms,nosnickid/forkcms,vytsci/forkcms,forkcms/forkcms,matthiasmullie/forkcms,tommyvdv/forkcms,vytsci/forkcms,bartdc/forkcms,justcarakas/forkcms,DegradationOfMankind/forkcms,jeroendesloovere/forkcms,Katrienvh/forkcms,ikoene/forkcms,vytsci/forkcms,carakas/forkcms,forkcms/forkcms,justcarakas/forkcms,dmoerman/forkcms,ikoene/forkcms