Merge pull request #968 from wiwie/develop