Merge branch 'release-1.7'

This commit is contained in:
beorn7 2017-09-28 16:46:33 +02:00
commit f1d4558469
2 changed files with 2 additions and 2 deletions