Merge branch 'master' into 'master'

Vhostalias additions

added missing part for vhostalias in backup-cron

server/lib/classes/cron.d/500-backup.inc.php

@@ -85,7 +85,7 @@ class cronjob_backup extends cronjob {
 
 			if($run_backups){
 				//* backup only active domains
-				$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'";
+				$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
 				$records = $app->db->queryAllRecords($sql);
 				if(is_array($records)) {
 					foreach($records as $rec) {