Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 05:18:39 PDT 2014