updated versions
Merge branch 'maarch'

Conflicts:
	stack/lapp/buildout.cfg
error message fix
simpler, more robust PBS promise