Go with 2.2.4.
Back to dev.
Merge branch 'xdebug_2_2'