Merge pull request #3966 from wsoltys/buildsys