Prevent possible crash when rendering a marker
Merge pull request #1894 from tambry/MarkerCrashFix

Prevent a possible crash when rendering a marker
Merge branch '6.0.x' into 6.1.x