Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 15:38:23 PDT 2014