Merge pull request #1219 from panzone/los_partial_marking