Merge branch 'devel'

Conflicts:
	src/octopi
Merge branch 'devel'
Merge branch 'devel'

Conflicts:
	src/octopi