Merge pull request #2366 from vlakoff/develop

index.php: minor improvement in VIEWPATH definition code