remove nslog
Merge branch 'mask'