+ batteries 2.3.0
Merge pull request #2746 from gasche/master

+ batteries 2.3.0