Merge remote-tracking branch 'origin/master' into npe_logs

# Conflicts:
#	NOTICE
2 jobs for !111 with npe_logs in 60 minutes (queued for 3 seconds)
latest merge request