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