RM5849: Fix for upstream c736569c737e96a69b75a6bc8e43ca9d5db5b2a3
RM5849: Fix for upstream c736569c737e96a69b75a6bc8e43ca9d5db5b2a3

alanquillin/quark,Cerberus98/quark,Cerberus98/quark,rackerlabs/quark,lmaycotte/quark,insequent/quark,lmaycotte/quark,asadoughi/quark,insequent/quark,roaet/quark,asadoughi/quark,roaet/quark,alanquillin/quark,rackerlabs/quark