Merge pull request #561 from dmatej/jenkins