fix for rare issue when using an controller named "index" and having an index.php in root
Merge remote-tracking branch 'origin/develop' into develop