Default 'set promisc' to ignore
Merge branch 'master' into next

* master:
  Default 'set promisc' to ignore

Conflicts:
	doc/UPDATES