Merge pull request #3140 from wsnipex/binary-addons