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