Release: version 2.3
Merge commit 'e1894f3b2dc63716ff3603aa94538f5eca7b937d'