Updated.
Merge branch 'master' of github.com:jenkinsci/secret-plugin

Conflicts:
	pom.xml