TRUNK-2553
Merge pull request #359 from LeeBreisacher/TRUNK-2553

TRUNK-2553