Skipjack map merge

Merged up-to-date dev with your branch, should be fine now.