Update map id from v87
Merge branch 'back4'

Conflicts:
	project.clj
	target/stale/extract-native.dependencies