Merge branch 'master' of https://github.com/POV-Ray/povray
Fix fs#324
Merge branch 'master' of https://github.com/LeForgeron/povray