bump version
Merge branch 'devel'

Conflicts:
	dist.ini
bump version