Don't throw an error when Esri server times out, just log it
Merge branch 'master' into ede