Merge branch '360-screenshots' into 1.8-dev

This commit is contained in:
Jonas Herzig
2018-01-16 13:47:55 +01:00
12 changed files with 425 additions and 4 deletions