Release 3.1

XDEV:  updates for release 3.1