Commit d06e2986ca8226dcf0b488db3baf31dfc99537d4

Steffen Jaeckel 2019-10-22T11:47:42

Merge tag 'v1.2.0' into develop v1.2.0