Merge pull request #3108 from rubenk/cirrus-improvements