Merge trunk. Mention users/groups update.
tree1447f53140eb4dc180c34848cdb9f65e08e17c7a
drwxr-xr-x - BOOK