Merging changes from 1.3

This corrects bug 1095 as well as some issues fixed by Istvan.