merging from ruby trunk
bumping version to 2.0.7