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