Added highlighting of NULL ciphers
Merge remote-tracking branch 'upstream/master'