We should probably just merge these and start committing to dev from now on.