TRUNK-3915 Resolved and successfully tested.
Merge pull request #344 from onceuponatimeforever/TRUNK-3915

TRUNK-3915 Resolved and successfully tested.