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