Merge pull request #1 from C-Logemann/6.x-3.x

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