fixes #680
Merge branch 'releases'