Resynced to upstream. Last commit: energy label now as a SimpleTextItem

Commit (upstream) b5103a0