Revision 753c982ff8c29f28a532c57bfb0118d402366287

Committed on 09/09/2018 8:00 pm by André R <ar@ez.no> [GitHub Diff]

Merge branch '6.7' into 6.13

Additional change for branch diff:
- Adapt Integration tests for changes in TrashItem (test double usage, so not a API change)