Release 3.1

XDEV: Updates for 3.1