small fix for OS X ML
sync
Merge remote-tracking branch 'origin/7.30'

Conflicts:
	ChangeLog
	configure.in
	src/parser.h