update to 3.1

Change-Id: If1fdff582f0442baf1c96c0a8becf870b30a368f