Merge remote-tracking branch 'origin/1.2.0-wip' into 1.2.0-wip
Example bugfixed
Merge remote-tracking branch 'origin/master' into 1.2.0-wip