Merge branch '2.1' into 2.2

This commit is contained in:
Markus Mäkelä
2017-11-27 09:10:33 +02:00
22 changed files with 1272 additions and 846 deletions