fix compilation on yosemite(at least)
Merge branch 'fixbobyqa'

Conflicts:
	bobyqa/bobyqa.h