merging from branch 1.1.7, releted to #704 & #705
git-svn-id: https://www.tol-project.org/svn/tolp/trunk@1131 be4846ae-f051-483a-831f-b64e7d08527f