Travis: Initiating build for commit '90f9ad35a36c49fcb537ce3b911bd97c96d0d81d' on branch 'multi_superuser': Merge remote-tracking branch 'origin/master' into multi_superuser

Conflicts:
	plugins/CustomAlerts