Go with 2.2.5.
Back to -dev.
Merge branch 'xdebug_2_2'