Improved circle markers as well
Merge branch 'vcs_hurricane_bug_fix' into devel