Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 21 00:26:43 PDT 2014