2013.07.28 committed

combine new/user user