Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 24 19:58:34 PDT 2014