Merge branch 'compact-bugs'

Conflicts:
	medea.js