PM|VK: improve hash manager to handle 'undo'
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/toolkit.js
	scripts/toolkit.js.map
	scripts/wiki.js
	scripts/wiki.js.map