Merge in 'ohrwurm'.
Merge in 'netsniff-ng'.
Merge in 'netmask'.