Imported Upstream version 0.26
Merge tag 'upstream/0.26'

Upstream version 0.26

Conflicts:
	.gitignore
Package upstream/0.26