Do not override the default history object.

fix #588
Merge branch '1.1.x'