Use 1.8.1 bugfix branch.

It contans bugfix from me.