patching in commit afb8e54f43576cfa35d531fc4383bce20f0e762a from crowdmob