checked for updates in svn
Merge branch 'master' into fetch-licenses-mojo