Merge pull request #3250 from wsnipex/buildsteps