Merging of changes from 1.4 revision 103713.