Merge trunk and branch [engage player/shared-resources]

Description

I committed all my patches into the branch but the branch has not been merged for ages with the trunk.
So: Branch > Trunk.

Steps to reproduce

None

Status

Assignee

Markus Ketterl

Reporter

Denis Meyer

Criticality

None

Tags (folksonomy)

None

Components

Fix versions

Affects versions

1.1.1

Priority

Major
Configure