Bump version number.
Merge branch 'master' into http_by_elisp

Conflicts:
	.gitignore