Merge pull request #3273 from modwizcode/fix-build