Merge pull request #5014 from Montellese/binary_addons