Merge branch 'master' into v0.9.0
Bug fix

pointed out by Rajeshkumar S
Merge branch 'v0.9.0'

Conflicts:
	Camomile/Makefile.in
Merge branch 'master' of https://github.com/yoriyuki/Camomile