Merge remote-tracking branch 'upstream/stable' into merge_stable

This commit is contained in:
Martin Nowak 2017-01-15 01:30:20 +01:00
commit 7e5940e63a

Diff content is not available