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