1.4 - Fix for bug #1139 - port from 1.3, including Changelog entry, too