Merged with the changes from trunk. Please check if I didn't break any changes during resolving conflicts.
« Back to merge proposal
Merged with the changes from trunk. Please check if I didn't break any changes during resolving conflicts.