Merge pull request #1785 from rinigus/master_issue1781