Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 09:48:26 PDT 2014