Merge tag '1.2.0' into debian