Merge pull request #4379 from mwichmann/release/build-update