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