ACE-460 Applied the patch. Thanks Herko.

git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1571697 13f79535-47bb-0310-9956-ffa450edef68