Elovetel +
E+
Merge remote-tracking branch 'origin/fixes'