Merge current nfc branch into new selinux branch #31

Closed davwheat closed 5 years ago