Full 201310 upgrade, folding in prev mods