Merge branch 'master' into extensions

Conflicts:
	example/eblob_backend.c