merge to bring parity with usergrid js sdk