Merge branch 'for-linville'