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