Merge pull request #1521 from aquarion/develop

Use the VIEWPATH constant, instead of assuming the user hasn't moved them