[BUGFIX release] Add missing HistoryLocation code that was lost in manual merge from es6=>stable
Merge pull request #4730 from jayphelps/missing-history-stuff

[BUGFIX release] Add missing HistoryLocation code that was lost in manual merge from es6 => stable