Merge pull request #2772 from blogic/libnfc