Fixup of issues coming from origin/master branch
Fixup of issues coming from origin/master branch
altendky/canmatrix,ebroecker/canmatrix,swatz/canmatrix,altendky/canmatrix,swatz/canmatrix,ebroecker/canmatrix