Handle certificates with no SAN extension
Merge remote-tracking branch 'upstream/master'