Use spaces for regex indentation
Update bundled toolbox to 1.1.10
__FILE__ symlink workaround, trac ticket #16953
Tweak description
Update version to 2.5.1