Re-add DOM history change by @okuryu

This was originally overwritten when merging in v3.14.1.
Merge branch 'dev-master' into dev-3.x