Merge pull request #3089 from pulpe/ard_fix