Merge pull request #1287 from zodf0055980/master