Fix to user edit
Merge branch '1.1.2-RELEASE'