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