Resolved a merge conflict. Included both changes manually.
Resolved a merge conflict. Included both changes manually.

OpenSC/OpenSC,fabled/OpenSC,CardContact/OpenSC,viktorTarasov/OpenSC-SM,hongquan/OpenSC-main,Jakuje/OpenSC,fabled/OpenSC,AktivCo/OpenSC,mouse07410/OpenSC,LudovicRousseau/OpenSC,dengert/OpenSC,frankmorgner/OpenSC,philipWendland/OpenSC,frankmorgner/OpenSC,metsma/OpenSC,AktivCo/OpenSC,LudovicRousseau/OpenSC,dengert/OpenSC,Jakuje/OpenSC,viktorTarasov/OpenSC-SM,fabled/OpenSC,hhonkanen/OpenSC,dengert/OpenSC,mouse07410/OpenSC,hhonkanen/OpenSC,fabled/OpenSC,philipWendland/OpenSC,OpenSC/OpenSC,Jakuje/OpenSC,rickyepoderi/OpenSC,hhonkanen/OpenSC,hongquan/OpenSC-main,LudovicRousseau/OpenSC,Jakuje/OpenSC,hongquan/OpenSC-main,frankmorgner/OpenSC,rickyepoderi/OpenSC,frankmorgner/OpenSC,metsma/OpenSC,OpenSC/OpenSC,viktorTarasov/OpenSC-SM,rickyepoderi/OpenSC,metsma/OpenSC,CardContact/OpenSC,AktivCo/OpenSC,mouse07410/OpenSC,philipWendland/OpenSC,CardContact/OpenSC