Merge remote-tracking branch 'origin/update-from-template-github_com_xdev-software_standard-maven-template_master'

Author: AB-xdev