#663 - Fix intermittent failure when importing users.
#663 - Fix intermittent failure when importing users.

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