Merge "Follow up to dirname( __FILE__ ) clean up"