d7089ab471
Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po