Applied Manik's pull request (https://github.com/belaban/JGroups/pull/100)
Merge remote-tracking branch 'origin/master'