merge devel into master - fixes to get it running