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