Merge branch 'sempixel-master'
Preparing release 2.3.0
Back to development: 2.3.1