Update module accounting
Merge remote-tracking branch 'Upstream/develop' into develop-patch
Correct rights & presentation
Merge pull request #1994 from aspangaro/develop-patch

Update module accounting