Imported Upstream version 1.2.4
Imported Upstream version 1.2.6
Imported Upstream version 1.2.7
Merge remote-tracking branch 'origin/upstream' into upstream