version 3.61

Change-Id: I30b6081bced8ccfc78c983cdb1d24660c4bf57d2