Devel

Merging devel into base at version 1.1.0