Merge remote-tracking branch 'origin/master' into dependabot/maven/sp… · jesperancinha/favourite-lyrics-app@4b7319c