Merge "Don't look for hooks in .php5 files that don't exist"