Fix marker's rendering
Merge remote-tracking branch 'remotes/upstream/mc1.5' into 1.5