Increment version.
Merge from master.
Merge branch 'master' of https://github.com/mommsen/evb

Conflicts:
	include/evb/version.h