Merge branch 'master' into v0.6.0

This commit is contained in:
Thomas Krijnen
2019-01-05 13:43:19 +01:00
2 changed files with 6 additions and 2 deletions