Fix #42.
Merge branch 'v1.3.x'