Upstream release 2017.1.5

This commit is contained in:
Marcel Kapfer 2017-07-12 19:16:25 +02:00
parent 664a22959c
commit 2e9c950c95
25 changed files with 146 additions and 121 deletions