Merge remote-tracking branch 'origin/v2017.1.x' into v2017.1.x

This commit is contained in:
Steffen Förster 2017-07-18 00:01:09 +02:00
commit fd3b05d352