TRUNK-287

Hi, I just applied the changes as suggested in the previous pull request.