Thanks Ben for providing the fix
Merge remote-tracking branch 'devel/bug258_hurricane_marker_test'

* devel/bug258_hurricane_marker_test:
  Thanks Ben for providing the fix