Merge branch 'ath-current' of git://github.com/kvalo/ath