0.6-trunk
