Merging latest updates into production branch.

Author: pjewald

src/main/webapp/WEB-INF/includes/pageparts/clientdownload.jsp

@@ -20,7 +20,7 @@
                 <div class="clients">
                     <div class="client MacOS">
                         <img src="<url:getCdnUrl url="/images/os-icons/mac_os.png"/>"/>
-                        <a href="${properties:downloadfiles('/BlocklyPropClient-installer.dmg')}">
+                        <a href="${properties:downloadfiles('/BlocklyPropClient-setup-MacOS.pkg')}">
                             <fmt:message key="clientdownload.client.macos.installer" /></a>
                     </div>
                     <!-- Windows 32bit client -->

src/main/webapp/WEB-INF/servlet/clientdownload.jsp

@@ -42,7 +42,7 @@
                     <div class="clients">
                         <div class="client MacOS">
                             <img src="<url:getCdnUrl url="/images/os-icons/mac_os.png"/>"/>
-                            <a href="${properties:downloadfiles('/BlocklyPropClient-installer.dmg')}">
+                            <a href="${properties:downloadfiles('/BlocklyPropClient-setup-MacOS.pkg')}">
                                 <fmt:message key="clientdownload.client.macos.installer" /></a>
                         </div>
                         <div class="client Windows">