Derps were had. I should really test more....
Merge remote-tracking branch 'origin/dev' into dev