upgrade to 0.9.6

Change-Id: Iec4c061060572fb559f12cdf11d388120c60f91f