NOTICE update and makefile fix

Merged Shane Hutchins requested to merge securityfix into dev
  • Makefile fix
  • NOTICE Update

Merge request reports