Merging trunk revisions 664 and 665 into tagged SICOPOLIS version 3.2.