Merge pull request #489 from Eonasdan/development

v3.1.0