Merge tag 'upstream/2.05.2'

Upstream version 2.05.2
This commit is contained in:
Mario Fetka 2017-11-01 11:59:01 +01:00
commit 76efdffd60

Diff Content Not Available