Add frobd binary to .gitignore
Merge branch 'next'