Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 03:18:55 PDT 2014