Add support for Less Neglect
merge remote-tracking branch 'upstream/master'