Remove __DIR__ since it's not PHP 5.2 safe
Merge PHP 5.2 compat fix