Do you want me to rebase the PR again? Should I use `.` prefix instead of `_` for the unlocked files, is it better?

As I already noted on the IRC.. the actual unlocked files are coming in separate commits (related to APC / XDEBUG / MCRYPT trello cards).