Merge branch 'stable-3.1'

Change-Id: I2c1e18b02c6f5cad3cc71a639449689a053a0e65