Merge remote-tracking branch 'origin/master'

Conflicts:
	install.ps1

install.ps1

@@ -62,9 +62,9 @@ if (($exchserver.admindisplayversion).major -eq 8 -and ($exchserver.admindisplay
 	$EXVER="Exchange 2013 SP1 CU11"
 } elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 0 -and ($exchserver.admindisplayversion).build -eq 1178) {
 	$EXVER="Exchange 2013 SP1 CU12"
-} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225) -and ($exchserver.admindisplayversion).revision -eq 17) {
+} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225 -and ($exchserver.admindisplayversion).revision -eq 17) {
 	$EXVER="Exchange 2016 Preview"
-} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225) -and ($exchserver.admindisplayversion).revision -eq 42) {
+} elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 225 -and ($exchserver.admindisplayversion).revision -eq 42) {
 	$EXVER="Exchange 2016 RTM"
 } elseif (($exchserver.admindisplayversion).major -eq 15 -and ($exchserver.admindisplayversion).minor -eq 1 -and ($exchserver.admindisplayversion).build -eq 396) {
 	$EXVER="Exchange 2016 CU1"
@@ -117,4 +117,4 @@ get-transportagent
 write-host "Starting Edge Transport" -f "green" 
 net start MSExchangeTransport 
 
-write-host "Installation complete. Check previous outputs for any errors!" -f "yellow" 
+write-host "Installation complete. Check previous outputs for any errors!" -f "yellow"