Updating for bug report 1205
Merging 1.4 from github