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