Added tag 0.8-36 for changeset 8eb324d1f3dedba9df2ad3bc650b3c83c6197028