Some fixes from upsteam
Some fixes from upsteam

mathiashelin/forkcms,jessedobbelaere/forkcms,sumocoders/forkcms,carakas/forkcms,vytenizs/forkcms,DegradationOfMankind/forkcms,riadvice/forkcms,mathiashelin/forkcms,carakas/forkcms,jacob-v-dam/forkcms,riadvice/forkcms,justcarakas/forkcms,vytenizs/forkcms,jeroendesloovere/forkcms,mathiashelin/forkcms,vytsci/forkcms,jessedobbelaere/forkcms,justcarakas/forkcms,sumocoders/forkcms,Katrienvh/forkcms,mathiashelin/forkcms,Thijzer/forkcms,carakas/forkcms,dmoerman/forkcms,tommyvdv/forkcms,jeroendesloovere/forkcms,jonasdekeukelaere/forkcms,Katrienvh/forkcms,Thijzer/forkcms,bartdc/forkcms,forkcms/forkcms,vytsci/forkcms,jeroendesloovere/forkcms,bartdc/forkcms,riadvice/forkcms,DegradationOfMankind/forkcms,jacob-v-dam/forkcms,forkcms/forkcms,riadvice/forkcms,dmoerman/forkcms,carakas/forkcms,sumocoders/forkcms,forkcms/forkcms,Katrienvh/forkcms,sumocoders/forkcms,jonasdekeukelaere/forkcms,dmoerman/forkcms,tommyvdv/forkcms,jacob-v-dam/forkcms,bartdc/forkcms,jonasdekeukelaere/forkcms,vytsci/forkcms,jessedobbelaere/forkcms,tommyvdv/forkcms,Katrienvh/forkcms,jacob-v-dam/forkcms,Thijzer/forkcms,jeroendesloovere/forkcms,DegradationOfMankind/forkcms,vytenizs/forkcms,justcarakas/forkcms,jonasdekeukelaere/forkcms,sumocoders/forkcms,DegradationOfMankind/forkcms,forkcms/forkcms,jessedobbelaere/forkcms,tommyvdv/forkcms,carakas/forkcms,jonasdekeukelaere/forkcms