fix bug 542
Merge branch '1.3.x'