Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 12:43:31 PDT 2014