Bug 948622 - Improve activate_edit_mode()
Merge pull request #14612 from viorelaioia/bug_948622

Bug 948622 - Improve activate_edit_mode()