Fixed bug when calling history pushstate in history on click event handler.
Merge branch 'bug-history' into development