Fix Merge remote-tracking branch 'js10-remote/devel' into oidc

Conflicts:

	htdocs/js/npg.js