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