Devel

This should fix problems created by the last merge of my changes.