Overlaid WorldPainter 1.8.5

Overlaid WorldPainter 1.8.5 - next step is to merge back in changes
from Master