Trinidad Committers Only - Committing Trinidad-1315

[Mamallan Uthaman]

Hi all,

I have provided a path for the issue Trinidad-1315. It would be great if 
anyone of committers is willing to apply the patch.

Thanks
Mamallan