Merge branch 'master' into develop

This commit is contained in:
Ines Montani 2017-11-07 14:50:22 +01:00 committed by GitHub
commit a540ab473d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23