Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 10:19:19 PDT 2014