Fix deprecation warning by changing e.message -> e.args[0]
Fix two deprecation warnings about e.message
Merge commit '1d0355dd09db8ea8def3fa624c9ec2cda993374c'
Merge commit '9764230787afc49bd4d3a6a8a4dd4c1e5dc51eef'
Merge branch 'master' into develop