Logical merge conflict fix.
Logical merge conflict fix.

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