Merge tag '0.7.6'