Bug fix release: 3.1.3
Merge pull request #5323 from speedblue/master

Bug fix release: 3.1.3