Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 11 06:37:40 PDT 2014