Changed from sakai-standard-tool to master