Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 20:48:34 PDT 2014