Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 09:38:39 PDT 2014