Merge "Removed empty index.php" into bug_561630