Merge "Maintenance: Use __DIR__ instead of dirname( __FILE__ )"