Merge remote-tracking branch 'upstream/master' into b843344
Merge branch 'b843344' of https://github.com/nicolaisi/dxr into b843344
Added pushState for the first run.

Signed-off-by: tanji <nicholastanjerome@gmail.com>