Merge of devel branch into master for release 0.7.0