Merge pull request #562 from dmatej/jenkins