Trinidad JIRA 1090

[Max Starets]

Just FYI -

I asked Jeanne to commit my patch for 
https://issues.apache.org/jira/browse/TRINIDAD-1090
into the trunk and the 1.2..8.1 branch. Hope there are no objections.
Thanks,
Max