Merge branch 'master' into devel
Merge branch 'master' into devel
use a very aggressive, but portable prompt setting scheme
updated changelog