Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath