Merge pull request #1024 from hoergen/develop