TRUNK-2894 Applied given patch. Resolved ticket.
Merge pull request #336 from onceuponatimeforever/TRUNK-2894

TRUNK-2894 Applied given patch. Resolved ticket.