Liquid adjusting: continue to drop
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/content_abm.cpp