Going to wait for 1.4.0 before I do any major changes to my instance again. Too much stuff has already changed in master, it's going to be merging hell.