Merge pull request #3773 from mono/bockbuild-integration