K 10 svn:author V 8 truckman K 8 svn:date V 27 2015-05-08T16:04:20.427895Z K 7 svn:log V 136 Resurrect the part of patch-i114430 that was not accepted upstream. Submitted by: pfg Approved by: mat (mentor, implicit) MFH: 2015Q2 END