Lingering merge error
Lingering merge error

simong/Hilary,ExC0d3/Hilary,Coenego/Hilary,mrvisser/Hilary,simong/Hilary,jfederico/Hilary,stuartf/Hilary,ExC0d3/Hilary,timdegroote/Hilary,stuartf/Hilary,nicolaasmatthijs/Hilary,mrvisser/Hilary,timdegroote/Hilary,jfederico/Hilary,Orodan/Hilary,Orodan/Hilary,nicolaasmatthijs/Hilary