maj 2.2.6 to 2.3.*, PLAYGROUND-502
Merge pull request #36 from thomaroger/troger-maj-2.3

maj 2.2.6 to 2.3.*, PLAYGROUND-502