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