Marker bug fix: hit testing would sometimes indicate hits
for markers that were across horizon and not visible.
Propagating changes from blankslate branch.