Version 3.1.1

Change-Id: I18557f3329bb3f8a5ab428a46af039a7b076162b