Merge branch 'master' into v0.6.0

This commit is contained in:
Thomas Krijnen
2018-12-29 14:26:16 +01:00
2 changed files with 2 additions and 1 deletions