Merge remote-tracking branch 'olebowle/ard'