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