closes #3086

I had to delete my github and local repos, do a fresh fork and edit this one-liner to get a single commit. I used to love git until I tried learning about rebasing and squashing...