Issue #2189919: D6 port of SA-CONTRIB-2014-010