Deb 0.6.1

final 0.6.1 merge