Switch to version 0.6

Change-Id: Ic39f41c605ecd666c1869a5f7bad11e48c4ac7a0