Release 3.1.1

Bug fix release.

Change-Id: I83d8b3b7fa9acd235082d3a4a5309f12a83b5ebb