Sync'd branch integration/b2g-inbound with upstream @ Sun Sep 28 20:09:42 PDT 2014