Prepping for 3.1.4 release
Merge branch 'develop'
Merge branch 'master' into develop