Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 12:13:41 PDT 2014