Record-only merge of r7882, r7883, and r7887 on nihvivo-rel-1.2-maint: updates have or will be made manually on trunk.
This commit is contained in:
parent
a10909b11b
commit
50e7e2099f