Argh.

I really hope this solves the "behind by 3 commits" issue, on the dev branch, otherwise I'm not sure what to do.