Record-only merge of r7792 from nihvivo-rel-1.2-maint branch. Same changes have been made independently on the trunk.
This commit is contained in:
parent
65a50bdff0
commit
ff5c63151c