Conflicts: include/class_plugin.inc plugins/admin/users/class_userManagement.inc
mentioned in issue #808 (closed)