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