(cherry picked from commit 126d596b56) Conflicts: src/data.js src/data/accepts.js test/unit/core.js test/unit/data.js
126d596b56