Code review on SUREFIRE-1264_2

[Tibor Digana]

Hi All,

I have pushed branch SUREFIRE-1264_2 which is bug fix for
Jira SUREFIRE-1264.
I have announced our user on Jira and asked him to test this fix in his
project.

-- 
Cheers
Tibor