Merge pull request #4010 from wsoltys/buildsys3