Fix for bug 544.
Merge branch '1.3.x'