Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 20:58:38 PDT 2014