Merge pull request #919 from rcordovano/develop

Interim merge of release-3.1.1 branch