Merge remote-tracking branch 'origin/develop' into develop
diff --git a/.gitignore b/.gitignore
index 865d742..3b9d3b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@
 [Dd]ebug*/
 !debugger/
 modules/debugger/classes/
+modules/asc/build/java/classes/
 [Rr]elease*/
 Ankh.NoLoad
 
diff --git a/ApproveSDK.xml b/ApproveSDK.xml
index ef60232..08134b7 100644
--- a/ApproveSDK.xml
+++ b/ApproveSDK.xml
@@ -54,9 +54,10 @@
 	
     <property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
     <property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
-	<property name="apache.rat.jar" value="apache-rat-0.8.jar" />
-	<property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
-	<property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
+    <property name="apache.rat.jar" value="apache-rat-0.11.jar" />
+    <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
+    <property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
+    <property name="apache.rat.tasks.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat-tasks/0.11" />
 	   
     <property file="${basedir}/approvesdk.properties"/>
     
@@ -160,12 +161,12 @@
 	</target>
 	
 	<target name="install-rat" depends="install-rat.jar,install-rat.tasks.jar" />
-	<target name="install-rat.jar" unless="apache.rat.found">
-		<get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" />
-	</target>
-	<target name="install-rat.tasks.jar" unless="apache.rat.tasks.found">
-		<get src="${apache.rat.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
-	</target>
+    <target name="install-rat.jar" unless="apache.rat.found">
+        <get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" />
+    </target>
+    <target name="install-rat.tasks.jar" unless="apache.rat.tasks.found">
+        <get src="${apache.rat.tasks.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
+    </target>
 	
     <target name="rat-taskdef" description="Rat taskdef">
         <typedef resource="org/apache/rat/anttasks/antlib.xml"
@@ -901,7 +902,7 @@
         </rat:report>
     </target>
     
-    <target name="external-jar-folder-dump" >
+    <target name="external-jar-folder-dump" if="isMac">
         <echo>list of folders in external jars.  This may impact LICENSE and NOTICE</echo>
         <antcall target="show-jar-folders" >
             <param name="thisFile" value="lib/external/commons-collections.jar" />
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4701df2..c6ac5da 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3,6 +3,9 @@
 
 Apache Flex SDK 4.16.0
 ----------------------
+Alex Harui, Andy Dufilie, Aron Nopanen, Dany Dhondt, Harbs, Judah Frangipane,
+Justin Mclean, Mark Kessler, Maxime Cowez, Mihai Chira, Olaf Krüger, OmPrakash Muppirala,
+Peter Marcoen, Stephan Plath, Sugan Naicker, Tamás Nepusz
 
 Apache Flex SDK 4.15.0
 ----------------------
diff --git a/NOTICE b/NOTICE
index 650a047..0abfa3a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Flex
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README b/README
index 9e65b3b..0bd9999 100644
--- a/README
+++ b/README
@@ -21,7 +21,7 @@
 
     http://flex.apache.org/
 
-The Apache Flex SDK 4.15 is a follow up release to version 4.14.1. It is
+The Apache Flex SDK 4.16 is a follow up release to version 4.15. It is
 compatible with most code written for the original Adobe Flex 4.6 SDK.
 
 
@@ -120,6 +120,9 @@
 
 Optional: Flex Messaging Common (* 8)         BLAZEDS_HOME
 
+Java Cryptography Extensions
+    (see note (*9))
+
 ---------------------------------------------------------------------
 
 * 1)
@@ -234,6 +237,10 @@
 source should be included in the artifact, so setting BLAZEDS_HOME is not
 required.
 
+* 9)
+The Java Cryptography Extensions (JCE) Unlimited Strength jars are needed in
+order to download 3rd party software. Download and install this from Oracle
+which version you need will depend on your Java version and OS.
 
 Get the source code
 -------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 12ecd42..5aaadc3 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,23 +3,99 @@
 
 New Features
 ____________
-None yet
+FLEX-35122  Update to Font Awesome 4.7
+
+AIR and Flash Player Support
+----------------------------
+- Support Flash Player 21.0, 22.0, 23.0 and 24.0
+- Support for AIR 21.0, 22.0, 23.0 and 24.0
 
 Bug Fixes
 ---------
-None yet
+FLEX-35165  Remove bundling of Apache 1.0 licensed software
+FLEX-35126  DropDownController inside a pop up still listens to MOUSE_DOWN and
+		MOUSE_DOWN_SOMEWHERE after the popup has closed
+FLEX-35125  DropDownList inside a PopUpAnchor doesn't close when another DropDownList
+		is selected
+FLEX-35124  RTE 1009 in DropDownController.systemManager_mouseDownHandler() when inside
+		a PopUpAnchor and other item is removed on click
+FLEX-35123  DOM XSS vulnerability in history.js
+FLEX-35109  falcon compiler's build.xml error
+FLEX-35106  Incorrect date in datefield popup for fr_FR locale
+FLEX-35100  TextFlowLine.recreateTextLine() throws a null object reference error
+FLEX-35099  BusyIndicator has the wrong wrong rotation centre for iOS
+FLEX-35097  How to compile AIR beta 22 with Flex SDK?
+FLEX-35084  Ability to specify FileAttributes at compile time (mxmlc)
+FLEX-35082  moveIndexFindRow doesn't accept integer values
+FLEX-35078  Fatal when SelectionManager tries to reapply selection onto changed textFlow
+FLEX-35056  Pressing escape on s:Alert causes a RangeError when Alert.CANCEL is passed
+		as defaultButtonFlag
+FLEX-35046  Broken icon using FlatSpark ButtonIcon on mobile apps
+FLEX-35045  Flatspark ButtonIcon - icon does not display
+FLEX-35043  Unexpected behaviour of ListCollectionView.itemUpdated() when only one
+		parameter supplied
+FLEX-35042  Mistake in example for Pattern 'O' in ASDoc for DateFormatter.formatString
+FLEX-35039  ListCollectionView.setItemAt places the item in the wrong position if there
+		are duplicate items in the collection
+FLEX-35037  Add ArrayCollection unit tests donated by Justin
+FLEX-35031  HierarchicalCollectionViewCursor cannot find sealed class instance
+FLEX-35028  Error in DataGrid getHeaderRendererAt(-1)
+FLEX-35025  Validator results cannot be intercepted if the value is null
+FLEX-34935  Copy From Word Document And Pasting Into TextRegion Not Working Properly
+FLEX-34926  Misplaced [PercentProxy] metatag in GridColumn
+FLEX-34738  Not delete BusyIndicator
+FLEX-34811  Email validator show allow apostrophe in email address
+FLEX-34698  Flatspark ButtonIcon: Introduce 'iconFontPlacement' style
+FLEX-34391  ScrollableStageText with large y value crashes app
+FLEX-34088  CalloutButton closes when selecting an item in a spark Dropdown
+FLEX-33646  The "required" property on Validator should be a getter/setter
+FLEX-33311  Null pointer fatal in ConstraintLayout when executing Transition on
+		DropDownList
+FLEX-33058  RTE in HierarchicalCollectionViewCursor when a refresh occurs and old cursor
+		had an enumerable property that new cursor item doesn't
+FLEX-31948  When all the columns are invisible, pressing any character Key throws RTE
+FLEX-27509  AdvancedListBase itemMaskFreeList is null
+FLEX-26808  s:DataGrid Drag and Drop of multiple items doesn't work
+FLEX-20313  SelectItem on AdvancedDataGrid use weird code
+
+
+Known Issues
+------------
+
+Adobe Flash Builder Integration
+
+Adobe Flash Builder 4.7 and Adobe Flash Builder 4.6 both contain a bug where,
+when generating the .mxml file for a new project that uses Apache Flex SDK
+4.10.0 or later Spark Application, Flash Builder will incorrectly insert the
+attribute:
+
+    layout="absolute"
+
+This results in a compile error in the new project.  The remedy is to simply
+remove the errant attribute.
+
+The following wiki page has been set up to contain the latest news on Adobe's
+attempt to correct this problem:
+
+    https://cwiki.apache.org/confluence/display/FLEX/Adobe+Flash+Builder+'New+Project'+Bug
+
+Adobe has provided a patch for Flash Builder 4.7 that resolves this issue:
+
+    http://helpx.adobe.com/flash-builder/kb/flex-new-project-issue--.html
+
+
 
 Apache Flex 4.15.0
 ==================
 
 New Features
 ------------
-- FLEX-34837    Full support for sorting on complex fields of DataGrid rows
-- FLEX-34852    Sorting by complex fields in ListCollectionView
-- FLEX-34927    Allow the setting of an arbitrary property on an object via
+FLEX-34837    Full support for sorting on complex fields of DataGrid rows
+FLEX-34852    Sorting by complex fields in ListCollectionView
+FLEX-34927    Allow the setting of an arbitrary property on an object via
                 ObjectUtil
-- FLEX-34941    Allow custom validators to use the triggerEvent
-- FLEX-34945    Validators now able to validate nested properties
+FLEX-34941    Allow custom validators to use the triggerEvent
+FLEX-34945    Validators now able to validate nested properties
 
 AIR and Flash Player Support
 ----------------------------
diff --git a/build.xml b/build.xml
index 9fd4ac4..66842ec 100644
--- a/build.xml
+++ b/build.xml
@@ -566,7 +566,7 @@
                 <include name="installer.properties/**"/>
                 <include name="CHANGES"/>
                 <include name="LICENSE"/>
-                <include name="licenseParts/*"/>
+                <include name="licenseParts/**"/>
                 <include name="NOTICE"/>
                 <include name="README"/>
                 <include name="RELEASE_NOTES"/>
@@ -1795,7 +1795,7 @@
                 <!-- exclude text files -->
                 <exclude name="CONTRIBUTING"/>
                 <exclude name="CONTRIBUTORS"/>
-                <exclude name="licenseParts/*"/>
+                <exclude name="licenseParts/**"/>
                 <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/>
                 <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/>
                 <exclude name="frameworks/projects/flatspark/src/flatspark/assets/fonts/**/OFL.txt"/>
diff --git a/frameworks/build.xml b/frameworks/build.xml
index c902ec5..500a186 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -232,6 +232,18 @@
 		<condition property="playerglobal.swfversion" value="31">
 			<equals arg1="${playerglobal.version}" arg2="20.0" />
 		</condition>
+		<condition property="playerglobal.swfversion" value="32">
+			<equals arg1="${playerglobal.version}" arg2="21.0" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="33">
+			<equals arg1="${playerglobal.version}" arg2="22.0" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="34">
+			<equals arg1="${playerglobal.version}" arg2="23.0" />
+		</condition>
+		<condition property="playerglobal.swfversion" value="35">
+			<equals arg1="${playerglobal.version}" arg2="24.0" />
+		</condition>
 	</target>	
 
     <!--
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 86536f1..538f142 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -32,13 +32,19 @@
     <property name="lib.opt.dir" value="${FLEX_HOME}/lib/external/optional"/>
 
     <property name="flex-deps.dir" value="flex_deps"/>
+    <property name="adobe.afe.url" value="https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw"/>
     <property name="adobe.afe.file" value="afe.jar"/>
+    <property name="adobe.aglj40.url" value="https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw"/>
     <property name="adobe.aglj40.file" value="aglj40.jar"/>
+    <property name="adobe.rideau.url" value="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw"/>
     <property name="adobe.rideau.file" value="rideau.jar"/>
+    <property name="adobe.flex-fontkit.url" value="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw"/>
     <property name="adobe.flex-fontkit.file" value="flex-fontkit.jar"/>
     <property name="pixelbender.url" value="http://www.apache.org/dyn/mirrors/mirrors.cgi" />
     <property name="pixelbender.folder" value="flex/pixelbender/1.0/binaries" />
     <property name="pixelbender.bin.zip" value="apache-flex-sdk-pixel-bender-1.0.0-bin.zip" />
+    <property name="osmf.url" value="https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/frameworks/libs/OSMF2_0.swc?format=raw" />
+    <property name="swfobject.url" value="https://codeload.github.com/swfobject/swfobject/zip/2.2" />
     
     <property name="adobe.flex.license" value="
         ${line.separator}
@@ -102,10 +108,7 @@
 
     <target name="download-osmf-swc" unless="osmf.swc.exists">
         <mkdir dir="${download.dir}"/>
-        <!-- get src="http://sourceforge.net/projects/osmf.adobe/files/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc/download" 
-            dest="${download.dir}/osmf.swc" 
-            verbose="false"/ -->
-        <get src="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc?r=&amp;ts=1381906346&amp;use_mirror=optimate" 
+        <get src="${osmf.url}"
             dest="${download.dir}/osmf.swc" 
             verbose="false" ignoreerrors="true"/>
         <antcall target="get-from-cache-if-needed" >
@@ -161,7 +164,7 @@
         description="Copies SWFObject from code.google.com">
         
         <mkdir dir="${download.dir}"/>
-        <get src="https://codeload.github.com/swfobject/swfobject/zip/2.2"
+        <get src="${swfobject.url}"
             dest="${download.dir}/swfobject_2_2.zip" 
             verbose="false" ignoreerrors="true"/>
         
@@ -312,7 +315,7 @@
 
     <target name="download-afe" unless="adobe.afe.download.exists" >
         <mkdir dir="${download.dir}"/>
-        <get src="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw"
+        <get src="${adobe.afe.url}"
             dest="${download.dir}/${adobe.afe.file}" ignoreerrors="true"/>
         <antcall target="get-from-cache-if-needed" >
             <param name="filename" value="${adobe.afe.file}" />
@@ -324,7 +327,7 @@
 
     <target name="download-aglj40" unless="adobe.aglj40.download.exists" >
         <mkdir dir="${download.dir}"/>
-        <get src="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw"
+        <get src="${adobe.aglj40.url}"
              dest="${download.dir}/${adobe.aglj40.file}" ignoreerrors="true"/>
          <antcall target="get-from-cache-if-needed" >
              <param name="filename" value="${adobe.aglj40.file}" />
@@ -336,7 +339,7 @@
 
     <target name="download-rideau" unless="adobe.rideau.download.exists" >
         <mkdir dir="${download.dir}"/>
-        <get src="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw"
+        <get src="${adobe.rideau.url}"
              dest="${download.dir}/${adobe.rideau.file}" ignoreerrors="true"/>
          <antcall target="get-from-cache-if-needed" >
              <param name="filename" value="${adobe.rideau.file}" />
@@ -348,7 +351,7 @@
 
     <target name="download-flex-fontkit" unless="adobe.flex-fontkit.download.exists" >
         <mkdir dir="${download.dir}"/>
-        <get src="http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw"
+        <get src="${adobe.flex-fontkit.url}"
              dest="${download.dir}/${adobe.flex-fontkit.file}" ignoreerrors="true"/>
          <antcall target="get-from-cache-if-needed" >
              <param name="filename" value="${adobe.flex-fontkit.file}" />
diff --git a/frameworks/projects/flatspark/src/flatspark/assets/fonts/awesome/FontAwesome.otf b/frameworks/projects/flatspark/src/flatspark/assets/fonts/awesome/FontAwesome.otf
index 3ed7f8b..401ec0f 100644
--- a/frameworks/projects/flatspark/src/flatspark/assets/fonts/awesome/FontAwesome.otf
+++ b/frameworks/projects/flatspark/src/flatspark/assets/fonts/awesome/FontAwesome.otf
Binary files differ
diff --git a/frameworks/projects/flatspark/src/flatspark/utils/AwesomeUtils.as b/frameworks/projects/flatspark/src/flatspark/utils/AwesomeUtils.as
index 87cfc06..2218cc5 100644
--- a/frameworks/projects/flatspark/src/flatspark/utils/AwesomeUtils.as
+++ b/frameworks/projects/flatspark/src/flatspark/utils/AwesomeUtils.as
@@ -1,19 +1,17 @@
 /**	
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.	
- */
+The MIT License (MIT)
+Copyright (c) 2016 by Dave Gandy
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, 
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 package flatspark.utils
 {
@@ -26,6 +24,10 @@
 		}
 		
 		public static const fa_500px:String = "\uf26e";
+		public static const fa_address_book:String = "\uf2b9";
+		public static const fa_address_book_o:String = "\uf2ba";
+		public static const fa_address_card:String = "\uf2bb";
+		public static const fa_address_card_o:String = "\uf2bc";
 		public static const fa_adjust:String = "\uf042";
 		public static const fa_adn:String = "\uf170";
 		public static const fa_align_center:String = "\uf037";
@@ -34,6 +36,7 @@
 		public static const fa_align_right:String = "\uf038";
 		public static const fa_amazon:String = "\uf270";
 		public static const fa_ambulance:String = "\uf0f9";
+		public static const fa_american_sign_language_interpreting:String = "\uf2a3";
 		public static const fa_anchor:String = "\uf13d";
 		public static const fa_android:String = "\uf17b";
 		public static const fa_angellist:String = "\uf209";
@@ -64,17 +67,24 @@
 		public static const fa_arrows_alt:String = "\uf0b2";
 		public static const fa_arrows_h:String = "\uf07e";
 		public static const fa_arrows_v:String = "\uf07d";
+		public static const fa_asl_interpreting:String = "\uf2a3";
+		public static const fa_assistive_listening_systems:String = "\uf2a2";
 		public static const fa_asterisk:String = "\uf069";
 		public static const fa_at:String = "\uf1fa";
+		public static const fa_audio_description:String = "\uf29e";
 		public static const fa_automobile:String = "\uf1b9";
 		public static const fa_backward:String = "\uf04a";
 		public static const fa_balance_scale:String = "\uf24e";
 		public static const fa_ban:String = "\uf05e";
+		public static const fa_bandcamp:String = "\uf2d5";
 		public static const fa_bank:String = "\uf19c";
 		public static const fa_bar_chart:String = "\uf080";
 		public static const fa_bar_chart_o:String = "\uf080";
 		public static const fa_barcode:String = "\uf02a";
 		public static const fa_bars:String = "\uf0c9";
+		public static const fa_bath:String = "\uf2cd";
+		public static const fa_bathtub:String = "\uf2cd";
+		public static const fa_battery:String = "\uf240";
 		public static const fa_battery_0:String = "\uf244";
 		public static const fa_battery_1:String = "\uf243";
 		public static const fa_battery_2:String = "\uf242";
@@ -100,6 +110,7 @@
 		public static const fa_bitbucket_square:String = "\uf172";
 		public static const fa_bitcoin:String = "\uf15a";
 		public static const fa_black_tie:String = "\uf27e";
+		public static const fa_blind:String = "\uf29d";
 		public static const fa_bluetooth:String = "\uf293";
 		public static const fa_bluetooth_b:String = "\uf294";
 		public static const fa_bold:String = "\uf032";
@@ -108,6 +119,7 @@
 		public static const fa_book:String = "\uf02d";
 		public static const fa_bookmark:String = "\uf02e";
 		public static const fa_bookmark_o:String = "\uf097";
+		public static const fa_braille:String = "\uf2a1";
 		public static const fa_briefcase:String = "\uf0b1";
 		public static const fa_btc:String = "\uf15a";
 		public static const fa_bug:String = "\uf188";
@@ -210,6 +222,8 @@
 		public static const fa_dashboard:String = "\uf0e4";
 		public static const fa_dashcube:String = "\uf210";
 		public static const fa_database:String = "\uf1c0";
+		public static const fa_deaf:String = "\uf2a4";
+		public static const fa_deafness:String = "\uf2a4";
 		public static const fa_dedent:String = "\uf03b";
 		public static const fa_delicious:String = "\uf1a5";
 		public static const fa_desktop:String = "\uf108";
@@ -220,18 +234,25 @@
 		public static const fa_dot_circle_o:String = "\uf192";
 		public static const fa_download:String = "\uf019";
 		public static const fa_dribbble:String = "\uf17d";
+		public static const fa_drivers_license:String = "\uf2c2";
+		public static const fa_drivers_license_o:String = "\uf2c3";
 		public static const fa_dropbox:String = "\uf16b";
 		public static const fa_drupal:String = "\uf1a9";
 		public static const fa_edge:String = "\uf282";
 		public static const fa_edit:String = "\uf044";
+		public static const fa_eercast:String = "\uf2da";
 		public static const fa_eject:String = "\uf052";
 		public static const fa_ellipsis_h:String = "\uf141";
 		public static const fa_ellipsis_v:String = "\uf142";
 		public static const fa_empire:String = "\uf1d1";
 		public static const fa_envelope:String = "\uf0e0";
 		public static const fa_envelope_o:String = "\uf003";
+		public static const fa_envelope_open:String = "\uf2b6";
+		public static const fa_envelope_open_o:String = "\uf2b7";
 		public static const fa_envelope_square:String = "\uf199";
+		public static const fa_envira:String = "\uf299";
 		public static const fa_eraser:String = "\uf12d";
+		public static const fa_etsy:String = "\uf2d7";
 		public static const fa_eur:String = "\uf153";
 		public static const fa_euro:String = "\uf153";
 		public static const fa_exchange:String = "\uf0ec";
@@ -245,6 +266,7 @@
 		public static const fa_eye:String = "\uf06e";
 		public static const fa_eye_slash:String = "\uf070";
 		public static const fa_eyedropper:String = "\uf1fb";
+		public static const fa_fa:String = "\uf2b4";
 		public static const fa_facebook:String = "\uf09a";
 		public static const fa_facebook_f:String = "\uf09a";
 		public static const fa_facebook_official:String = "\uf230";
@@ -279,6 +301,7 @@
 		public static const fa_fire:String = "\uf06d";
 		public static const fa_fire_extinguisher:String = "\uf134";
 		public static const fa_firefox:String = "\uf269";
+		public static const fa_first_order:String = "\uf2b0";
 		public static const fa_flag:String = "\uf024";
 		public static const fa_flag_checkered:String = "\uf11e";
 		public static const fa_flag_o:String = "\uf11d";
@@ -291,11 +314,13 @@
 		public static const fa_folder_open:String = "\uf07c";
 		public static const fa_folder_open_o:String = "\uf115";
 		public static const fa_font:String = "\uf031";
+		public static const fa_font_awesome:String = "\uf2b4";
 		public static const fa_fonticons:String = "\uf280";
 		public static const fa_fort_awesome:String = "\uf286";
 		public static const fa_forumbee:String = "\uf211";
 		public static const fa_forward:String = "\uf04e";
 		public static const fa_foursquare:String = "\uf180";
+		public static const fa_free_code_camp:String = "\uf2c5";
 		public static const fa_frown_o:String = "\uf119";
 		public static const fa_futbol_o:String = "\uf1e3";
 		public static const fa_gamepad:String = "\uf11b";
@@ -314,15 +339,21 @@
 		public static const fa_github:String = "\uf09b";
 		public static const fa_github_alt:String = "\uf113";
 		public static const fa_github_square:String = "\uf092";
+		public static const fa_gitlab:String = "\uf296";
 		public static const fa_gittip:String = "\uf184";
 		public static const fa_glass:String = "\uf000";
+		public static const fa_glide:String = "\uf2a5";
+		public static const fa_glide_g:String = "\uf2a6";
 		public static const fa_globe:String = "\uf0ac";
 		public static const fa_google:String = "\uf1a0";
 		public static const fa_google_plus:String = "\uf0d5";
+		public static const fa_google_plus_circle:String = "\uf2b3";
+		public static const fa_google_plus_official:String = "\uf2b3";
 		public static const fa_google_plus_square:String = "\uf0d4";
 		public static const fa_google_wallet:String = "\uf1ee";
 		public static const fa_graduation_cap:String = "\uf19d";
 		public static const fa_gratipay:String = "\uf184";
+		public static const fa_grav:String = "\uf2d6";
 		public static const fa_group:String = "\uf0c0";
 		public static const fa_h_square:String = "\uf0fd";
 		public static const fa_hacker_news:String = "\uf1d4";
@@ -339,6 +370,8 @@
 		public static const fa_hand_scissors_o:String = "\uf257";
 		public static const fa_hand_spock_o:String = "\uf259";
 		public static const fa_hand_stop_o:String = "\uf256";
+		public static const fa_handshake_o:String = "\uf2b5";
+		public static const fa_hard_of_hearing:String = "\uf2a4";
 		public static const fa_hashtag:String = "\uf292";
 		public static const fa_hdd_o:String = "\uf0a0";
 		public static const fa_header:String = "\uf1dc";
@@ -361,8 +394,12 @@
 		public static const fa_houzz:String = "\uf27c";
 		public static const fa_html5:String = "\uf13b";
 		public static const fa_i_cursor:String = "\uf246";
+		public static const fa_id_badge:String = "\uf2c1";
+		public static const fa_id_card:String = "\uf2c2";
+		public static const fa_id_card_o:String = "\uf2c3";
 		public static const fa_ils:String = "\uf20b";
 		public static const fa_image:String = "\uf03e";
+		public static const fa_imdb:String = "\uf2d8";
 		public static const fa_inbox:String = "\uf01c";
 		public static const fa_indent:String = "\uf03c";
 		public static const fa_industry:String = "\uf275";
@@ -400,6 +437,7 @@
 		public static const fa_link:String = "\uf0c1";
 		public static const fa_linkedin:String = "\uf0e1";
 		public static const fa_linkedin_square:String = "\uf08c";
+		public static const fa_linode:String = "\uf2b8";
 		public static const fa_linux:String = "\uf17c";
 		public static const fa_list:String = "\uf03a";
 		public static const fa_list_alt:String = "\uf022";
@@ -411,6 +449,7 @@
 		public static const fa_long_arrow_left:String = "\uf177";
 		public static const fa_long_arrow_right:String = "\uf178";
 		public static const fa_long_arrow_up:String = "\uf176";
+		public static const fa_low_vision:String = "\uf2a8";
 		public static const fa_magic:String = "\uf0d0";
 		public static const fa_magnet:String = "\uf076";
 		public static const fa_mail_forward:String = "\uf064";
@@ -431,8 +470,10 @@
 		public static const fa_meanpath:String = "\uf20c";
 		public static const fa_medium:String = "\uf23a";
 		public static const fa_medkit:String = "\uf0fa";
+		public static const fa_meetup:String = "\uf2e0";
 		public static const fa_meh_o:String = "\uf11a";
 		public static const fa_mercury:String = "\uf223";
+		public static const fa_microchip:String = "\uf2db";
 		public static const fa_microphone:String = "\uf130";
 		public static const fa_microphone_slash:String = "\uf131";
 		public static const fa_minus:String = "\uf068";
@@ -482,8 +523,9 @@
 		public static const fa_photo:String = "\uf03e";
 		public static const fa_picture_o:String = "\uf03e";
 		public static const fa_pie_chart:String = "\uf200";
-		public static const fa_pied_piper:String = "\uf1a7";
+		public static const fa_pied_piper:String = "\uf2ae";
 		public static const fa_pied_piper_alt:String = "\uf1a8";
+		public static const fa_pied_piper_pp:String = "\uf1a7";
 		public static const fa_pinterest:String = "\uf0d2";
 		public static const fa_pinterest_p:String = "\uf231";
 		public static const fa_pinterest_square:String = "\uf0d3";
@@ -496,6 +538,7 @@
 		public static const fa_plus_circle:String = "\uf055";
 		public static const fa_plus_square:String = "\uf0fe";
 		public static const fa_plus_square_o:String = "\uf196";
+		public static const fa_podcast:String = "\uf2ce";
 		public static const fa_power_off:String = "\uf011";
 		public static const fa_print:String = "\uf02f";
 		public static const fa_product_hunt:String = "\uf288";
@@ -504,10 +547,13 @@
 		public static const fa_qrcode:String = "\uf029";
 		public static const fa_question:String = "\uf128";
 		public static const fa_question_circle:String = "\uf059";
+		public static const fa_question_circle_o:String = "\uf29c";
+		public static const fa_quora:String = "\uf2c4";
 		public static const fa_quote_left:String = "\uf10d";
 		public static const fa_quote_right:String = "\uf10e";
 		public static const fa_ra:String = "\uf1d0";
 		public static const fa_random:String = "\uf074";
+		public static const fa_ravelry:String = "\uf2d9";
 		public static const fa_rebel:String = "\uf1d0";
 		public static const fa_recycle:String = "\uf1b8";
 		public static const fa_reddit:String = "\uf1a1";
@@ -521,6 +567,7 @@
 		public static const fa_repeat:String = "\uf01e";
 		public static const fa_reply:String = "\uf112";
 		public static const fa_reply_all:String = "\uf122";
+		public static const fa_resistance:String = "\uf1d0";
 		public static const fa_retweet:String = "\uf079";
 		public static const fa_rmb:String = "\uf157";
 		public static const fa_road:String = "\uf018";
@@ -533,6 +580,7 @@
 		public static const fa_rub:String = "\uf158";
 		public static const fa_ruble:String = "\uf158";
 		public static const fa_rupee:String = "\uf156";
+		public static const fa_s15:String = "\uf2cd";
 		public static const fa_safari:String = "\uf267";
 		public static const fa_save:String = "\uf0c7";
 		public static const fa_scissors:String = "\uf0c4";
@@ -557,9 +605,12 @@
 		public static const fa_shopping_bag:String = "\uf290";
 		public static const fa_shopping_basket:String = "\uf291";
 		public static const fa_shopping_cart:String = "\uf07a";
+		public static const fa_shower:String = "\uf2cc";
 		public static const fa_sign_in:String = "\uf090";
+		public static const fa_sign_language:String = "\uf2a7";
 		public static const fa_sign_out:String = "\uf08b";
 		public static const fa_signal:String = "\uf012";
+		public static const fa_signing:String = "\uf2a7";
 		public static const fa_simplybuilt:String = "\uf215";
 		public static const fa_sitemap:String = "\uf0e8";
 		public static const fa_skyatlas:String = "\uf216";
@@ -568,6 +619,10 @@
 		public static const fa_sliders:String = "\uf1de";
 		public static const fa_slideshare:String = "\uf1e7";
 		public static const fa_smile_o:String = "\uf118";
+		public static const fa_snapchat:String = "\uf2ab";
+		public static const fa_snapchat_ghost:String = "\uf2ac";
+		public static const fa_snapchat_square:String = "\uf2ad";
+		public static const fa_snowflake_o:String = "\uf2dc";
 		public static const fa_soccer_ball_o:String = "\uf1e3";
 		public static const fa_sort:String = "\uf0dc";
 		public static const fa_sort_alpha_asc:String = "\uf15d";
@@ -613,6 +668,7 @@
 		public static const fa_subway:String = "\uf239";
 		public static const fa_suitcase:String = "\uf0f2";
 		public static const fa_sun_o:String = "\uf185";
+		public static const fa_superpowers:String = "\uf2dd";
 		public static const fa_superscript:String = "\uf12b";
 		public static const fa_support:String = "\uf1cd";
 		public static const fa_table:String = "\uf0ce";
@@ -622,6 +678,7 @@
 		public static const fa_tags:String = "\uf02c";
 		public static const fa_tasks:String = "\uf0ae";
 		public static const fa_taxi:String = "\uf1ba";
+		public static const fa_telegram:String = "\uf2c6";
 		public static const fa_television:String = "\uf26c";
 		public static const fa_tencent_weibo:String = "\uf1d5";
 		public static const fa_terminal:String = "\uf120";
@@ -630,6 +687,18 @@
 		public static const fa_th:String = "\uf00a";
 		public static const fa_th_large:String = "\uf009";
 		public static const fa_th_list:String = "\uf00b";
+		public static const fa_themeisle:String = "\uf2b2";
+		public static const fa_thermometer:String = "\uf2c7";
+		public static const fa_thermometer_0:String = "\uf2cb";
+		public static const fa_thermometer_1:String = "\uf2ca";
+		public static const fa_thermometer_2:String = "\uf2c9";
+		public static const fa_thermometer_3:String = "\uf2c8";
+		public static const fa_thermometer_4:String = "\uf2c7";
+		public static const fa_thermometer_empty:String = "\uf2cb";
+		public static const fa_thermometer_full:String = "\uf2c7";
+		public static const fa_thermometer_half:String = "\uf2c9";
+		public static const fa_thermometer_quarter:String = "\uf2ca";
+		public static const fa_thermometer_three_quarters:String = "\uf2c8";
 		public static const fa_thumb_tack:String = "\uf08d";
 		public static const fa_thumbs_down:String = "\uf165";
 		public static const fa_thumbs_o_down:String = "\uf088";
@@ -639,6 +708,8 @@
 		public static const fa_times:String = "\uf00d";
 		public static const fa_times_circle:String = "\uf057";
 		public static const fa_times_circle_o:String = "\uf05c";
+		public static const fa_times_rectangle:String = "\uf2d3";
+		public static const fa_times_rectangle_o:String = "\uf2d4";
 		public static const fa_tint:String = "\uf043";
 		public static const fa_toggle_down:String = "\uf150";
 		public static const fa_toggle_left:String = "\uf191";
@@ -669,6 +740,7 @@
 		public static const fa_umbrella:String = "\uf0e9";
 		public static const fa_underline:String = "\uf0cd";
 		public static const fa_undo:String = "\uf0e2";
+		public static const fa_universal_access:String = "\uf29a";
 		public static const fa_university:String = "\uf19c";
 		public static const fa_unlink:String = "\uf127";
 		public static const fa_unlock:String = "\uf09c";
@@ -678,20 +750,28 @@
 		public static const fa_usb:String = "\uf287";
 		public static const fa_usd:String = "\uf155";
 		public static const fa_user:String = "\uf007";
+		public static const fa_user_circle:String = "\uf2bd";
+		public static const fa_user_circle_o:String = "\uf2be";
 		public static const fa_user_md:String = "\uf0f0";
+		public static const fa_user_o:String = "\uf2c0";
 		public static const fa_user_plus:String = "\uf234";
 		public static const fa_user_secret:String = "\uf21b";
 		public static const fa_user_times:String = "\uf235";
 		public static const fa_users:String = "\uf0c0";
+		public static const fa_vcard:String = "\uf2bb";
+		public static const fa_vcard_o:String = "\uf2bc";
 		public static const fa_venus:String = "\uf221";
 		public static const fa_venus_double:String = "\uf226";
 		public static const fa_venus_mars:String = "\uf228";
 		public static const fa_viacoin:String = "\uf237";
+		public static const fa_viadeo:String = "\uf2a9";
+		public static const fa_viadeo_square:String = "\uf2aa";
 		public static const fa_video_camera:String = "\uf03d";
 		public static const fa_vimeo:String = "\uf27d";
 		public static const fa_vimeo_square:String = "\uf194";
 		public static const fa_vine:String = "\uf1ca";
 		public static const fa_vk:String = "\uf189";
+		public static const fa_volume_control_phone:String = "\uf2a0";
 		public static const fa_volume_down:String = "\uf027";
 		public static const fa_volume_off:String = "\uf026";
 		public static const fa_volume_up:String = "\uf028";
@@ -701,11 +781,20 @@
 		public static const fa_weixin:String = "\uf1d7";
 		public static const fa_whatsapp:String = "\uf232";
 		public static const fa_wheelchair:String = "\uf193";
+		public static const fa_wheelchair_alt:String = "\uf29b";
 		public static const fa_wifi:String = "\uf1eb";
 		public static const fa_wikipedia_w:String = "\uf266";
+		public static const fa_window_close:String = "\uf2d3";
+		public static const fa_window_close_o:String = "\uf2d4";
+		public static const fa_window_maximize:String = "\uf2d0";
+		public static const fa_window_minimize:String = "\uf2d1";
+		public static const fa_window_restore:String = "\uf2d2";
 		public static const fa_windows:String = "\uf17a";
 		public static const fa_won:String = "\uf159";
 		public static const fa_wordpress:String = "\uf19a";
+		public static const fa_wpbeginner:String = "\uf297";
+		public static const fa_wpexplorer:String = "\uf2de";
+		public static const fa_wpforms:String = "\uf298";
 		public static const fa_wrench:String = "\uf0ad";
 		public static const fa_xing:String = "\uf168";
 		public static const fa_xing_square:String = "\uf169";
@@ -716,6 +805,7 @@
 		public static const fa_yc_square:String = "\uf1d4";
 		public static const fa_yelp:String = "\uf1e9";
 		public static const fa_yen:String = "\uf157";
+		public static const fa_yoast:String = "\uf2b1";
 		public static const fa_youtube:String = "\uf167";
 		public static const fa_youtube_play:String = "\uf16a";
 		public static const fa_youtube_square:String = "\uf166";
diff --git a/frameworks/projects/framework/src/mx/utils/ObjectUtil.as b/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
index 74aa9d6..260d372 100644
--- a/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
+++ b/frameworks/projects/framework/src/mx/utils/ObjectUtil.as
@@ -1228,7 +1228,7 @@
     /**
      *  Verifies if the first object is dynamic and is a subset of the second object.
      *
-     *  @param values The values which need to be shared by <code>object</object>
+     *  @param values The values which need to be shared by <code>object</code>
      *  @param object The object to verify against.
      *
      *  @return true if and only if the objects are the same, or if <code>values</code>
diff --git a/frameworks/projects/framework/src/mx/validators/EmailValidator.as b/frameworks/projects/framework/src/mx/validators/EmailValidator.as
index 9776db3..69fd688 100644
--- a/frameworks/projects/framework/src/mx/validators/EmailValidator.as
+++ b/frameworks/projects/framework/src/mx/validators/EmailValidator.as
@@ -74,7 +74,7 @@
 	 *  @private
 	 */
 	private static const DISALLOWED_LOCALNAME_CHARS:String =
-								"()<>,;:\\\"[] `~!#$%^&*={}|/?'\t\n\r";
+								"()<>,;:\\\"[] `~!#$%^&*={}|/?\t\n\r";
 	/**
 	 *  @private
 	 */							
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/BusyIndicatorSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/BusyIndicatorSkin.as
index 805887b..a4fe64f 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/BusyIndicatorSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/BusyIndicatorSkin.as
@@ -153,6 +153,16 @@
 				symbolColorChanged = true;
 				invalidateDisplayList();
 			}
+			if (styleProp == "styleName") {
+				var value:String = getStyle("styleName");
+				
+				// We're being removed from the stage
+				if (value == null) {
+					stopRotation();
+					busyIndicatorBackground = null;
+					busyIndicator = null;
+				}
+			}
 			super.styleChanged(styleProp);
 		}
 		
@@ -206,15 +216,15 @@
 			event.updateAfterEvent();
 		}
 		
-		private var rotationMatrix:Matrix; 
 		private function rotate(obj:DisplayObject, angle:Number, aroundX:Number, aroundY:Number):void
 		{
-			rotationMatrix = new Matrix();
-			rotationMatrix.translate(-aroundX,-aroundY);
+			var center:Number = Math.min(aroundX, aroundY); // stop wobbling if not square
+			var rotationMatrix:Matrix = new Matrix();
+			rotationMatrix.translate(-center,-center);
 			rotationMatrix.rotate(Math.PI*angle/180);
-			rotationMatrix.translate(aroundX,aroundY);
+			rotationMatrix.translate(center,center);
 			obj.transform.matrix = rotationMatrix;
 		}
 		
 	}
-}
\ No newline at end of file
+}
diff --git a/frameworks/projects/spark/src/spark/components/DropDownList.as b/frameworks/projects/spark/src/spark/components/DropDownList.as
index e4dbd96..b6dfa01 100644
--- a/frameworks/projects/spark/src/spark/components/DropDownList.as
+++ b/frameworks/projects/spark/src/spark/components/DropDownList.as
@@ -367,11 +367,13 @@
     {
         if (labelDisplay)
         {
-            if (displayItem == undefined)
-                displayItem = selectedItem;
-            else
-                labelDisplay.text = displayItem != null ? LabelUtil.itemToLabel(displayItem, labelField, labelFunction) : prompt;
-        }
+              if (displayItem == undefined)
+                  displayItem = selectedItem;
+              if (displayItem != null && displayItem != undefined)
+                  labelDisplay.text = LabelUtil.itemToLabel(displayItem, labelField, labelFunction);
+              else
+                  labelDisplay.text = prompt;
+		}
     }
 }
 }
\ No newline at end of file
diff --git a/frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as b/frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as
index c1c98e5..b0feef0 100644
--- a/frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as
+++ b/frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as
@@ -239,6 +239,18 @@
 				symbolColorChanged = true;
 				invalidateDisplayList();
 			}
+			
+			if (styleProp == "styleName") {
+				var value:String = getStyle("styleName");
+				
+				// We're being removed from the stage
+				if (value == null) {
+					stopRotation();
+					busyIndicatorBackground = null;
+					busyIndicator = null;
+				}
+			}
+			
 			super.styleChanged(styleProp);
 		}
 		
@@ -326,16 +338,17 @@
 			event.updateAfterEvent();
 		}
 		
-		private var rotationMatrix:Matrix; 
 		private function rotate(obj:DisplayObject, angle:Number, aroundX:Number, aroundY:Number):void
 		{
-			rotationMatrix = new Matrix();
-			rotationMatrix.translate(-aroundX,-aroundY);
+			var center:Number = Math.min(aroundX, aroundY); // stop wobbling if not square
+			var rotationMatrix:Matrix = new Matrix();
+			rotationMatrix.translate(-center,-center);
 			rotationMatrix.rotate(Math.PI*angle/180);
-			rotationMatrix.translate(aroundX,aroundY);
+			rotationMatrix.translate(center,center);
 			obj.transform.matrix = rotationMatrix;
 		}
 		
 	}
 }
 
+
diff --git a/ide/addAIRtoSDK.sh b/ide/addAIRtoSDK.sh
index aeb7575..0677c66 100755
--- a/ide/addAIRtoSDK.sh
+++ b/ide/addAIRtoSDK.sh
@@ -30,7 +30,9 @@
 AIR_VERSION="$1"
 OS=`uname`
 
-if [[ "${AIR_VERSION}" != "20.0"  && "${AIR_VERSION}" != "19.0"  && "${AIR_VERSION}" != "18.0"
+if [[ "${AIR_VERSION}" != "24.0"
+  && "${AIR_VERSION}" != "23.0"  && "${AIR_VERSION}" != "22.0"  && "${AIR_VERSION}" != "21.0"
+  &&  "${AIR_VERSION}" != "20.0"  && "${AIR_VERSION}" != "19.0"  && "${AIR_VERSION}" != "18.0"
   && "${AIR_VERSION}" != "17.0" && "${AIR_VERSION}" != "16.0" && "${AIR_VERSION}" != "15.0" 
   && "${AIR_VERSION}" != "14.0" && "${AIR_VERSION}" != "13.0" && "${AIR_VERSION}" != "4.0" 
   && "${AIR_VERSION}" != "3.9" && "${AIR_VERSION}" != "3.8" && "${AIR_VERSION}" != "3.7" 
@@ -38,7 +40,7 @@
   && "${AIR_VERSION}" != "3.3" && "${AIR_VERSION}" != "3.2" && "${AIR_VERSION}" != "3.1" 
   && "${AIR_VERSION}" != "3.0" && "${AIR_VERSION}" != "2.7" && "${AIR_VERSION}" != "2.6" ]]
 then
-	echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0 and 20.0 are supported.
+	echo Unknown version ${AIR_VERISON} of AIR. Versions 2.6, 2.7, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0,  23.0 and 24.0 are supported.
 	exit 1;
 fi
 
@@ -101,23 +103,32 @@
 
     if [[ "${OS}" == "Darwin" ]]
     then
-        airDownload="http://airdownload.adobe.com/air/mac/download/${version}/AdobeAIRSDK.tbz2"
+        airDownload="https://airdownload.adobe.com/air/mac/download/${version}/AdobeAIRSDK.tbz2"
     else
-        airDownload="http://airdownload.adobe.com/air/lin/download/${version}/AdobeAIRSDK.tbz2"
+        airDownload="https://airdownload.adobe.com/air/lin/download/${version}/AdobeAIRSDK.tbz2"
     fi
-    
-    if [ ${AIR_VERSION} = "17.0b" ]
-	then
-		airDownload="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air17_sdk_sa_mac.tbz2"
-	fi	
-	
+
+    if [[ "${AIR_VERSION}" == "24.0" ]]
+    then
+        airDownload="https://airdownload.adobe.com/air/mac/download/24.0/AdobeAIRSDK.dmg"
 	echo Downloading AIR ${version}
+	echo from ${airDownload}
+	curl ${airDownload} > "${airTempDir}/air.dmg"
+	
+	echo Extracting into SDK 
+	hdiutil attach -nobrowse "${airTempDir}"/air.dmg
+	cp -fR "/Volumes/AIR SDK/" "${IDE_SDK_DIR}"
+	umount "/Volumes/AIR SDK"
+    else
+	echo Downloading AIR ${version}
+	echo from ${airDownload}
 	curl ${airDownload} > "${airTempDir}/air.tbz2"
 	
 	echo Extracting into SDK  
 	tar xf "${airTempDir}/air.tbz2" -C "${IDE_SDK_DIR}"
+    fi
 
-	rm -rf "${airTempDir}"	
+    rm -rf "${airTempDir}"	
 }
 
 agreeLicense
@@ -162,6 +173,34 @@
 do
 	echo Updating ${configFile}
 	
+	# 24.0 needs FP 24 and swf version 35
+	if [ ${AIR_VERSION} = "23.0" ]
+	then
+		updatePlayerVersion 24.0 "${configFile}"
+		updateSWFVersion 35 "${configFile}"
+	fi
+
+	# 23.0 needs FP 23 and swf version 34
+	if [ ${AIR_VERSION} = "23.0" ]
+	then
+		updatePlayerVersion 23.0 "${configFile}"
+		updateSWFVersion 34 "${configFile}"
+	fi
+
+	# 22.0 needs FP 22 and swf version 33
+	if [ ${AIR_VERSION} = "22.0" ]
+	then
+		updatePlayerVersion 22.0 "${configFile}"
+		updateSWFVersion 33 "${configFile}"
+	fi
+
+	# 21.0 needs FP 21 and swf version 32
+	if [ ${AIR_VERSION} = "21.0" ]
+	then
+		updatePlayerVersion 21.0 "${configFile}"
+		updateSWFVersion 32 "${configFile}"
+	fi
+
 	# 20.0 needs FP 20 and swf version 31
 	if [ ${AIR_VERSION} = "20.0" ]
 	then
diff --git a/ide/checkAllPlayerGlobals.sh b/ide/checkAllPlayerGlobals.sh
index 9c0590f..5a8aaa2 100755
--- a/ide/checkAllPlayerGlobals.sh
+++ b/ide/checkAllPlayerGlobals.sh
@@ -81,8 +81,8 @@
     playerGlobalDir="${IDE_SDK_DIR}/frameworks/libs/player/${version}"
     playerGlobalSWC="${playerGlobalDir}/playerglobal.swc"
     MD5check=$2
-    AdobeURL=$3
-    
+    AdobeURL="https://fpdownload.macromedia.com/get/flashplayer/installers/archive/playerglobal/$3"
+   echo ${AdobeURL} 
 	mkdir -p "${playerGlobalDir}"
 	if [ ! -f "${playerGlobalSWC}" ]
 	then
@@ -108,24 +108,28 @@
 
 # Note Adobe releases new versions of playerglobal.swf so if your checksum is wrong it may mean you just don't have the latest
 
-downloadPlayerGlobal 10.2 aa7d785dd5715626201f5e30fc1deb51 http://fpdownload.macromedia.com/get/flashplayer/installers/archive/playerglobal/playerglobal10_2.swc
-downloadPlayerGlobal 10.3 6092b3d4e2784212d174ca10904412bd http://fpdownload.macromedia.com/get/flashplayer/installers/archive/playerglobal/playerglobal10_3.swc
-downloadPlayerGlobal 11.0 5f5a291f02105cd83fb582b76646e603 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_0.swc
-downloadPlayerGlobal 11.1 e3a0e0e8c703ae5b1847b8ac25bbdc5f http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
-downloadPlayerGlobal 11.2 c544a069518897880e0d732457b6fdeb http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
-downloadPlayerGlobal 11.3 e2a9ee439d9660feaf756aa05e7e6412 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
-downloadPlayerGlobal 11.4 e15587856cdb5e21fa1acb6b0610a032 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
-downloadPlayerGlobal 11.5 00384b24157442c59ca5d625ecfd11a2 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
-downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_6.swc
-downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
-downloadPlayerGlobal 11.8 35bc69eec5091f70e221b4e63b66b60f http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc
-downloadPlayerGlobal 11.9 d18244c3c00c61a41f2d4d791d09fedb http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc
-downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 http://fpdownload.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc
-downloadPlayerGlobal 13.0 b824fb3db644d065bc27cae2382eb361 http://fpdownload.macromedia.com/get/flashplayer/updaters/13/playerglobal13_0.swc
-downloadPlayerGlobal 14.0 0d7aa820d62ba76fa7bc353ee552bd49 http://fpdownload.macromedia.com/get/flashplayer/updaters/14/playerglobal14_0.swc
-downloadPlayerGlobal 15.0 8bb52e65abb4e0c6a357f2ccde1ec626 http://fpdownload.macromedia.com/get/flashplayer/updaters/15/playerglobal15_0.swc
-downloadPlayerGlobal 16.0 5bf5a05a4065a247bf65e7342a4c770f http://fpdownload.macromedia.com/get/flashplayer/updaters/16/playerglobal16_0.swc
-downloadPlayerGlobal 17.0 e86a0fd5131fe3c2fd1e052314237ca9 http://fpdownload.macromedia.com/get/flashplayer/updaters/17/playerglobal17_0.swc
-downloadPlayerGlobal 18.0 7451e9a7e6296c6a09022f42adcf57a5 http://fpdownload.macromedia.com/get/flashplayer/updaters/17/playerglobal18_0.swc
-downloadPlayerGlobal 19.0 e2e67b0851afaa512c2e2f31c43d5fba http://fpdownload.macromedia.com/get/flashplayer/updaters/17/playerglobal19_0.swc
-downloadPlayerGlobal 20.0 d308cdf324f086e7b2f0c1317f698c0c http://fpdownload.macromedia.com/get/flashplayer/updaters/17/playerglobal20_0.swc
+downloadPlayerGlobal 10.2 aa7d785dd5715626201f5e30fc1deb51 playerglobal10_2.swc
+downloadPlayerGlobal 10.3 6092b3d4e2784212d174ca10904412bd playerglobal10_3.swc
+downloadPlayerGlobal 11.0 5f5a291f02105cd83fb582b76646e603 playerglobal11_0.swc
+downloadPlayerGlobal 11.1 e3a0e0e8c703ae5b1847b8ac25bbdc5f playerglobal11_1.swc
+downloadPlayerGlobal 11.2 c544a069518897880e0d732457b6fdeb playerglobal11_2.swc
+downloadPlayerGlobal 11.3 e791741422bcda27d47489a2db39da14 playerglobal11_3.swc
+downloadPlayerGlobal 11.4 a8cb5fc008ee88ac2d32bd425ad49d78 playerglobal11_4.swc
+downloadPlayerGlobal 11.5 00384b24157442c59ca5d625ecfd11a2 playerglobal11_5.swc
+downloadPlayerGlobal 11.6 1b841a0a26ada3e5da26eb70c32ab263 playerglobal11_6.swc
+downloadPlayerGlobal 11.7 12656571c57b2ad641838e5695a00e27 playerglobal11_7.swc
+downloadPlayerGlobal 11.8 35bc69eec5091f70e221b4e63b66b60f playerglobal11_8.swc
+downloadPlayerGlobal 11.9 d18244c3c00c61a41f2d4d791d09fedb playerglobal11_9.swc
+downloadPlayerGlobal 12.0 4db4e934f39f774ba68fcd9a79654971 playerglobal12_0.swc
+downloadPlayerGlobal 13.0 b824fb3db644d065bc27cae2382eb361 playerglobal13_0.swc
+downloadPlayerGlobal 14.0 0d7aa820d62ba76fa7bc353ee552bd49 playerglobal14_0.swc
+downloadPlayerGlobal 15.0 8bb52e65abb4e0c6a357f2ccde1ec626 playerglobal15_0.swc
+downloadPlayerGlobal 16.0 5bf5a05a4065a247bf65e7342a4c770f playerglobal16_0.swc
+downloadPlayerGlobal 17.0 e86a0fd5131fe3c2fd1e052314237ca9 playerglobal17_0.swc
+downloadPlayerGlobal 18.0 371310a916950a7956507bf9cdf1bb63 playerglobal18_0.swc
+downloadPlayerGlobal 19.0 3f2473dd35a55427886abfc1807eaa98 playerglobal19_0.swc
+downloadPlayerGlobal 20.0 444ea8e8f2cddec22ed8b77e0d61bfe2 playerglobal20_0.swc
+downloadPlayerGlobal 21.0 1dd14e80b962327ccd17ce1321dc2135 playerglobal21_0.swc
+downloadPlayerGlobal 22.0 177e7f8cb98bc874b73296791b747128 playerglobal22_0.swc
+downloadPlayerGlobal 23.0 1a7cd9b61930be524e9c98e1a85feebe playerglobal23_0.swc
+downloadPlayerGlobal 24.0 aea2bcc689232752ef68efbf98368066 playerglobal24_0.swc
diff --git a/ide/flashbuilder/config/air-config.xml b/ide/flashbuilder/config/air-config.xml
index 4b48d04..2ee5cfd 100644
--- a/ide/flashbuilder/config/air-config.xml
+++ b/ide/flashbuilder/config/air-config.xml
@@ -80,7 +80,6 @@
          <path-element>libs</path-element>
          <path-element>libs/mx</path-element>
          <path-element>libs/air</path-element>
-         <path-element>libs/air</path-element>
          <path-element>locale/{locale}</path-element>
       </library-path>
      
@@ -353,7 +352,7 @@
       <!-- Framework SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/framework.swc</path-element>
-		<rsl-url>framework_4.15.0.0.swf</rsl-url>
+		<rsl-url>framework_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 	  
 	  <!-- TextLayout SWC -->
@@ -363,37 +362,37 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/textLayout.swc</path-element>
-		<rsl-url>textLayout_4.15.0.0.swf</rsl-url>
+		<rsl-url>textLayout_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
     
       <!-- Spark SWC-->
    	<runtime-shared-library-path>
 		<path-element>libs/spark.swc</path-element>
-		<rsl-url>spark_4.15.0.0.swf</rsl-url>
+		<rsl-url>spark_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 	
       <!-- Sparkskins SWC-->
    	<runtime-shared-library-path>
 		<path-element>libs/sparkskins.swc</path-element>
-		<rsl-url>sparkskins_4.15.0.0.swf</rsl-url>
+		<rsl-url>sparkskins_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 	 
 	  <!-- RPC SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/rpc.swc</path-element>
-		<rsl-url>rpc_4.15.0.0.swf</rsl-url>
+		<rsl-url>rpc_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
     	
       <!-- Charts SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/charts.swc</path-element>
-		<rsl-url>charts_4.15.0.0.swf</rsl-url>
+		<rsl-url>charts_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Spark_dmv SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/spark_dmv.swc</path-element>
-		<rsl-url>spark_dmv_4.15.0.0.swf</rsl-url>
+		<rsl-url>spark_dmv_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- OSMF SWC -->
@@ -403,19 +402,19 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/osmf.swc</path-element>
-		<rsl-url>osmf_4.15.0.0.swf</rsl-url>
+		<rsl-url>osmf_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
       
       <!-- MX SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/mx/mx.swc</path-element>
-		<rsl-url>mx_4.15.0.0.swf</rsl-url>
+		<rsl-url>mx_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
    
       <!-- Advancedgrids SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/advancedgrids.swc</path-element>
-		<rsl-url>advancedgrids_4.15.0.0.swf</rsl-url>
+		<rsl-url>advancedgrids_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 	
     <!-- static-link-runtime-shared-libraries: statically link the libraries specified by the -runtime-shared-libraries-path option.-->
diff --git a/ide/flashbuilder/config/flex-config.xml b/ide/flashbuilder/config/flex-config.xml
index f9f830d..c705f25 100644
--- a/ide/flashbuilder/config/flex-config.xml
+++ b/ide/flashbuilder/config/flex-config.xml
@@ -357,7 +357,7 @@
       <!-- Framework SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/framework.swc</path-element>
-		<rsl-url>framework_4.15.0.0.swf</rsl-url>
+		<rsl-url>framework_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
 	  <!-- TextLayout SWC -->
@@ -367,37 +367,37 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/textLayout.swc</path-element>
-		<rsl-url>textLayout_4.15.0.0.swf</rsl-url>
+		<rsl-url>textLayout_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Spark SWC-->
    	<runtime-shared-library-path>
 		<path-element>libs/spark.swc</path-element>
-		<rsl-url>spark_4.15.0.0.swf</rsl-url>
+		<rsl-url>spark_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Sparkskins SWC-->
    	<runtime-shared-library-path>
 		<path-element>libs/sparkskins.swc</path-element>
-		<rsl-url>sparkskins_4.15.0.0.swf</rsl-url>
+		<rsl-url>sparkskins_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
 	  <!-- RPC SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/rpc.swc</path-element>
-		<rsl-url>rpc_4.15.0.0.swf</rsl-url>
+		<rsl-url>rpc_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Charts SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/charts.swc</path-element>
-		<rsl-url>charts_4.15.0.0.swf</rsl-url>
+		<rsl-url>charts_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Spark_dmv SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/spark_dmv.swc</path-element>
-		<rsl-url>spark_dmv_4.15.0.0.swf</rsl-url>
+		<rsl-url>spark_dmv_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- OSMF SWC -->
@@ -407,19 +407,19 @@
     -->
     <runtime-shared-library-path>
 		<path-element>libs/osmf.swc</path-element>
-		<rsl-url>osmf_4.15.0.0.swf</rsl-url>
+		<rsl-url>osmf_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- MX SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/mx/mx.swc</path-element>
-		<rsl-url>mx_4.15.0.0.swf</rsl-url>
+		<rsl-url>mx_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
       <!-- Advancedgrids SWC -->
 	<runtime-shared-library-path>
 		<path-element>libs/advancedgrids.swc</path-element>
-		<rsl-url>advancedgrids_4.15.0.0.swf</rsl-url>
+		<rsl-url>advancedgrids_4.16.0.0.swf</rsl-url>
 	</runtime-shared-library-path>
 
 	<!-- static-link-runtime-shared-libraries: statically link the libraries specified by the -runtime-shared-libraries-path option.-->
diff --git a/ide/setFlashPlayerVersion.sh b/ide/setFlashPlayerVersion.sh
index 94de920..63dccec 100755
--- a/ide/setFlashPlayerVersion.sh
+++ b/ide/setFlashPlayerVersion.sh
@@ -99,13 +99,13 @@
         then 
             FLASH_VERSION="11.1"
         else
-            FLASH_VERSION="20.0"
+            FLASH_VERSION="24.0"
         fi
     fi
     
     if [ ${latest} = "Y" ]
     then
-    	FLASH_VERSION="20.0"
+    	FLASH_VERSION="24.0"
     fi
 
     echo "Setting minimum Flash Player version to ${FLASH_VERSION}"
@@ -125,9 +125,10 @@
   && "${FLASH_VERSION}" != "12.0" && "${FLASH_VERSION}" != "13.0" && "${FLASH_VERSION}" != "14.0"
   && "${FLASH_VERSION}" != "15.0" && "${FLASH_VERSION}" != "16.0" && "${FLASH_VERSION}" != "17.0"
   && "${FLASH_VERSION}" != "17.0" && "${FLASH_VERSION}" != "18.0" && "${FLASH_VERSION}" != "19.0"
-  && "${FLASH_VERSION}" != "20.0" ]]
+  && "${FLASH_VERSION}" != "20.0" && "${FLASH_VERSION}" != "21.0" && "${FLASH_VERSION}" != "22.0"
+  && "${FLASH_VERSION}" != "23.0" && "${FLASH_VERSION}" != "24.0" ]]
 then
-	echo Unknown version ${FLASH_VERSION} of Flash Player. Versions 10.2, 10.3, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0 and 20.0 are supported.
+	echo Unknown version ${FLASH_VERSION} of Flash Player. Versions 10.2, 10.3, 11.0, 11.1, 11.2, 11.3, 11.4, 11.5, 11.6, 11.7, 11.8, 11.9, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0 and 24.0 are supported.
 	exit 1;
 fi
 
@@ -148,11 +149,41 @@
 	echo Installing AIR
 	echo
 
-	if [[ $FLASH_VERSION = "17.0b" ]]
+	if [[ $FLASH_VERSION = "24.0" ]]
     then
-        ./addAIRtoSDK.sh 17.0b "$IDE_SDK_DIR"
+        ./addAIRtoSDK.sh 24.0 "$IDE_SDK_DIR"
     fi
-    
+
+	if [[ $FLASH_VERSION = "23.0" ]]
+    then
+        ./addAIRtoSDK.sh 23.0 "$IDE_SDK_DIR"
+    fi
+
+	if [[ $FLASH_VERSION = "22.0" ]]
+    then
+        ./addAIRtoSDK.sh 22.0 "$IDE_SDK_DIR"
+    fi
+
+	if [[ $FLASH_VERSION = "21.0" ]]
+    then
+        ./addAIRtoSDK.sh 21.0 "$IDE_SDK_DIR"
+    fi
+
+	if [[ $FLASH_VERSION = "20.0" ]]
+    then
+        ./addAIRtoSDK.sh 20.0 "$IDE_SDK_DIR"
+    fi
+
+	if [[ $FLASH_VERSION = "19.0" ]]
+    then
+        ./addAIRtoSDK.sh 19.0 "$IDE_SDK_DIR"
+    fi
+
+	if [[ $FLASH_VERSION = "18.0" ]]
+    then
+$        ./addAIRtoSDK.sh 18.0 "$IDE_SDK_DIR"
+    fi
+
 	if [[ $FLASH_VERSION = "17.0" ]]
     then
         ./addAIRtoSDK.sh 17.0 "$IDE_SDK_DIR"
@@ -241,11 +272,41 @@
 	
 	updatePlayerVersion "${FLASH_VERSION}" "${configFile}"
 
-	if [ ${FLASH_VERSION} = "17.0b	" ]
+	if [ ${FLASH_VERSION} = "24.0" ]
 	then
-		updateSWFVersion 28 "${configFile}"
+		updateSWFVersion 35 "${configFile}"
+	fi
+
+	if [ ${FLASH_VERSION} = "23.0" ]
+	then
+		updateSWFVersion 34 "${configFile}"
+	fi
+
+	if [ ${FLASH_VERSION} = "22.0" ]
+	then
+		updateSWFVersion 33 "${configFile}"
+	fi
+
+	if [ ${FLASH_VERSION} = "21.0" ]
+	then
+		updateSWFVersion 32 "${configFile}"
 	fi
 	
+	if [ ${FLASH_VERSION} = "20.0" ]
+	then
+		updateSWFVersion 31 "${configFile}"
+	fi
+
+	if [ ${FLASH_VERSION} = "19.0" ]
+	then
+		updateSWFVersion 30 "${configFile}"
+	fi
+
+	if [ ${FLASH_VERSION} = "18.0" ]
+	then
+		updateSWFVersion 29 "${configFile}"
+	fi
+
 	if [ ${FLASH_VERSION} = "17.0" ]
 	then
 		updateSWFVersion 28 "${configFile}"
diff --git a/installer.xml b/installer.xml
index f86ecec..38ace4f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -151,8 +151,8 @@
     <target name="get-data">

 		<tstamp />

 		<property name="ts" value="${DSTAMP}${TSTAMP}" />

-		<!-- <property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${ts}" />

-        <get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" /> -->

+		<property name="xml.properties" value="http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${ts}" />

+        <get src="${xml.properties}" dest="${basedir}/sdk-installer-config-4.0.xml" />

         <xmlproperty file="${basedir}/sdk-installer-config-4.0.xml" semanticAttributes="true" collapseAttributes="true"/>

         <xmlproperty file="${basedir}/flex-sdk-description.xml" semanticAttributes="true" collapseAttributes="true"/>

         <condition property="air.sdk.version" value="${config.airsdk.linux.versions.default}">

@@ -419,7 +419,11 @@
     	<echo message="Should unzip: ${shouldUnzip}"/>

     </target>

 

+<<<<<<< HEAD
     <target name="unzipAIRSDK" if="${shouldUnzip}" depends="unzipOrMountDMG">

+=======
+    <target name="unzipAIRSDK" if="${shouldUnzip}">

+>>>>>>> release4.16.0
     	<echo message="Unzipping"/>

 

     	<!--The tbz2 contains symlinks which Ant does not preserve

@@ -439,15 +443,27 @@
         <delete file="${basedir}/airtar.properties" />

     </target>

     

+<<<<<<< HEAD
 	<target name="mountAIRSDK" unless="${shouldUnzip}" depends="unzipOrMountDMG">

 		<echo message="Mounting dmg"/>

 		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">

 	      <arg value="attach"/>

+=======
+	<target name="mountAIRSDK" unless="${shouldUnzip}">

+		<echo message="Mounting dmg"/>

+		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">

+	      <arg value="attach"/>

+	      <arg value="-nobrowse"/>

+>>>>>>> release4.16.0
 	      <arg value="${download.dir}/airsdk/${air.sdk.url.file}"/>

 	    </exec>

 	</target>

 

+<<<<<<< HEAD
 	<target name="copyFromMount" unless="${shouldUnzip}" depends="mountAIRSDK">

+=======
+	<target name="copyFromMount" unless="${shouldUnzip}">

+>>>>>>> release4.16.0
 		<echo message="Copying AIR SDK from mounted volume"/>

 		<exec executable="rsync" dir="${FLEX_HOME}">

             <arg value="--archive" />

@@ -458,7 +474,11 @@
         </exec>

 	</target>

 

+<<<<<<< HEAD
 	<target name="unmountAIRSDK" unless="${shouldUnzip}" depends="copyFromMount">

+=======
+	<target name="unmountAIRSDK" unless="${shouldUnzip}">

+>>>>>>> release4.16.0
 		<echo message="Unmounting AIR SDK"/>

 		<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="false">

 	      <arg value="unmount"/>

@@ -466,7 +486,11 @@
 	    </exec>

 	</target>

     

+<<<<<<< HEAD
     <target name="air-setup-mac" depends="unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK" unless="isWindows">

+=======
+    <target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK" unless="isWindows">

+>>>>>>> release4.16.0
         <antcall target="mac-copy-file">

             <param name="srcdir" value="." />

             <param name="filename" value="AIR SDK license.pdf"/>

diff --git a/licenseParts/NOTICE.asc b/licenseParts/NOTICE.asc
index 1c55ec9..e53dfe0 100644
--- a/licenseParts/NOTICE.asc
+++ b/licenseParts/NOTICE.asc
@@ -1,5 +1,5 @@
 Apache Flex
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/licenseParts/NOTICE.base b/licenseParts/NOTICE.base
index d89968c..c9e609e 100644
--- a/licenseParts/NOTICE.base
+++ b/licenseParts/NOTICE.base
@@ -1,5 +1,5 @@
 Apache Flex
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/licenseParts/NOTICE.pb b/licenseParts/NOTICE.pb
index 0ac5a3a..ae5b56a 100644
--- a/licenseParts/NOTICE.pb
+++ b/licenseParts/NOTICE.pb
@@ -1,5 +1,5 @@
 Apache Flex
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/licenseParts/saxon9-NOTICES/APACHE-ANT.txt b/licenseParts/saxon9-NOTICES/APACHE-ANT.txt
new file mode 100644
index 0000000..f80fc57
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/APACHE-ANT.txt
@@ -0,0 +1,13 @@
+Apache Ant
+Copyright 1999-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes also software developed by :
+  - the W3C consortium (http://www.w3c.org) ,
+  - the SAX project (http://www.saxproject.org)
+
+The <sync> task is based on code Copyright (c) 2002, Landmark
+Graphics Corp that has been kindly donated to the Apache Software
+Foundation.
diff --git a/licenseParts/saxon9-NOTICES/APACHE-RESOLVER.txt b/licenseParts/saxon9-NOTICES/APACHE-RESOLVER.txt
new file mode 100644
index 0000000..cf064e3
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/APACHE-RESOLVER.txt
@@ -0,0 +1,9 @@
+Apache XML Commons Resolver
+Copyright 2006 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation http://www.apache.org/
+
+Portions of this code are derived from classes placed in the
+public domain by Arbortext on 10 Apr 2000. See:
+http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
diff --git a/licenseParts/saxon9-NOTICES/APACHE-XERCES.txt b/licenseParts/saxon9-NOTICES/APACHE-XERCES.txt
new file mode 100644
index 0000000..602c753
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/APACHE-XERCES.txt
@@ -0,0 +1,17 @@
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache Xerces Java distribution. ==
+   =========================================================================
+
+   Apache Xerces Java
+   Copyright 1999-2006 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+     - voluntary contributions made by Paul Eng on behalf of the 
+       Apache Software Foundation that were originally developed at iClick, Inc.,
+       software copyright (c) 1999.
\ No newline at end of file
diff --git a/licenseParts/saxon9-NOTICES/CERN.txt b/licenseParts/saxon9-NOTICES/CERN.txt
new file mode 100644
index 0000000..23a43ea
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/CERN.txt
@@ -0,0 +1,7 @@
+Copyright © 1999 CERN - European Organization for Nuclear Research.<br/><br/>
+
+Permission to use, copy, modify, distribute and sell this software and its documentation for any purpose
+is hereby granted without fee, provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear in supporting documentation.
+CERN makes no representations about the suitability of this software for any purpose.
+It is provided "as is" without expressed or implied warranty.
\ No newline at end of file
diff --git a/licenseParts/saxon9-NOTICES/FRIJTERS.txt b/licenseParts/saxon9-NOTICES/FRIJTERS.txt
new file mode 100644
index 0000000..827e26a
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/FRIJTERS.txt
@@ -0,0 +1,22 @@
+Copyright (C) 2002-2007 Jeroen Frijters
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+  
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+  
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+     
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+     
+  3. This notice may not be removed or altered from any source distribution.
+  
+  Jeroen Frijters
+  jeroen@frijters.net
diff --git a/licenseParts/saxon9-NOTICES/GPL+CLASSPATH.txt b/licenseParts/saxon9-NOTICES/GPL+CLASSPATH.txt
new file mode 100644
index 0000000..eeab58c
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/GPL+CLASSPATH.txt
@@ -0,0 +1,347 @@
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Sun Microsystems, Inc.  are subject to
+the following clarification and special exception to the GPL, but only where
+Sun has expressly included in the particular source file's header the words
+"Sun designates this particular file as subject to the "Classpath" exception
+as provided by Sun in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
diff --git a/licenseParts/saxon9-NOTICES/JAMESCLARK.txt b/licenseParts/saxon9-NOTICES/JAMESCLARK.txt
new file mode 100644
index 0000000..36b9918
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/JAMESCLARK.txt
@@ -0,0 +1,25 @@
+Copyright (c) 1998, 1999 James Clark
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL JAMES CLARK BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of James Clark shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from James Clark.
diff --git a/licenseParts/saxon9-NOTICES/LEGAL.txt b/licenseParts/saxon9-NOTICES/LEGAL.txt
new file mode 100644
index 0000000..8e2a59b
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/LEGAL.txt
@@ -0,0 +1,33 @@
+LEGAL NOTICE
+
+This notice is issued to fulfil the requirements of the Mozilla Public License version 1.0 ("MPL 1.0")
+sections 3.4(a) and 3.6. MPL 1.0 can be found at http://www.mozilla.org/MPL/MPL-1.0.html. 
+
+Section 3.4(a) of MPL 1.0 states that any third party intellectual property rights in particular 
+functionality or code must be notified in a text file named LEGAL that is issued with the source code. Saxon 
+includes a number of such third party components, and the relevant claims are included in notices included
+in the same directory as this notice. Although MPL 1.0 requires this notice to be included only with source
+code, some of the third parties may also require notices to be included with executable code. Therefore, Saxon
+executable code must not be distributed separately from this notice and all the accompanying third
+party notices. The term "Distribution" here includes making the code available for download, and its 
+inclusion in download repositories such as Maven.
+
+Section 3.6 of MPL 1.0 states:
+
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have 
+been met for that Covered Code, and if You include a notice stating that the Source Code version of 
+the Covered Code is available under the terms of this License, including a description of how and 
+where You have fulfilled the obligations of Section 3.2.
+
+Section 3.2 requires the Source Code of Covered Code to be made available via an accepted Electronic
+Distribution Mechanism.
+
+The Source Code version of the Covered Code (that is, the source code of Saxon-B) is available under the 
+terms of the Mozilla Public License version 1.0, and may be obtained from the Subversion repository 
+for the Saxon project on SourceForge, at https://sourceforge.net/svn/?group_id=29872. 
+The precise version of the Subversion source for a particular Saxon maintenance release can be 
+determined by referring to the release notes for the particular release in the SourceForge download area.
+
+Note that MPL 1.0 requires that any modifications to this source code must be made available under the terms
+of the MPL "to anyone to whom you made an executable version available". As a courtesy, it is also requested 
+that you make such modifications available to Saxonica Limited.
\ No newline at end of file
diff --git a/licenseParts/saxon9-NOTICES/LICENSE.txt b/licenseParts/saxon9-NOTICES/LICENSE.txt
new file mode 100644
index 0000000..331abb1
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/LICENSE.txt
@@ -0,0 +1,15 @@
+The contents of these file are subject to the Mozilla Public License Version 1.0 (the "License"); 
+you may not use these files except in compliance with the License. You may obtain a copy of the 
+License at http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis, 
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the 
+specific language governing rights and limitations under the License.
+
+The Original Code is all Saxon modules labelled with a notice referring to this license.
+
+The Initial Developer of the Original Code is Michael Kay, except where otherwise specified in an individual module.
+
+Portions created by other named contributors are copyright as identified in the relevant module. All Rights Reserved.
+
+Contributor(s) are listed in the documentation: see notices/contributors. 
\ No newline at end of file
diff --git a/licenseParts/saxon9-NOTICES/THAI.txt b/licenseParts/saxon9-NOTICES/THAI.txt
new file mode 100644
index 0000000..3fe0aaa
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/THAI.txt
@@ -0,0 +1,31 @@
+Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+    Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+    Neither the name of the Thai Open Source Software Center Ltd nor
+    the names of its contributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/licenseParts/saxon9-NOTICES/UNICODE.txt b/licenseParts/saxon9-NOTICES/UNICODE.txt
new file mode 100644
index 0000000..54afc82
--- /dev/null
+++ b/licenseParts/saxon9-NOTICES/UNICODE.txt
@@ -0,0 +1,29 @@
+COPYRIGHT AND PERMISSION NOTICE
+Copyright © 1991-2007 Unicode, Inc. All rights reserved. Distributed under the Terms of Use 
+in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode 
+data files and any associated documentation (the "Data Files") or Unicode software and any 
+associated documentation (the "Software") to deal in the Data Files or Software without 
+restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, 
+and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or 
+Software are furnished to do so, provided that (a) the above copyright notice(s) and this 
+permission notice appear with all copies of the Data Files or Software, (b) both the above 
+copyright notice(s) and this permission notice appear in associated documentation, and 
+(c) there is clear notice in each modified Data File or in the Software as well as in the 
+documentation associated with the Data File(s) or Software that the data or software has 
+been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE 
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, 
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, 
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA 
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used 
+in advertising or otherwise to promote the sale, use or other dealings in these 
+Data Files or Software without prior written authorization of the copyright holder.
diff --git a/modules/asc/src/java/macromedia/asc/embedding/Main.java b/modules/asc/src/java/macromedia/asc/embedding/Main.java
index 0ea60ee..c67841c 100644
--- a/modules/asc/src/java/macromedia/asc/embedding/Main.java
+++ b/modules/asc/src/java/macromedia/asc/embedding/Main.java
@@ -387,7 +387,7 @@
 		{
 			System.out.println("ActionScript 3.0 for AVM+");
 			System.out.println("version " + Version.getVersion() + " build "+ Version.getBuild());
-			System.out.println("Copyright 2016 The Apache Software Foundation");
+			System.out.println("Copyright 2017 The Apache Software Foundation");
 			System.out.println("All rights reserved\n");
 			System.out.println("Usage:");
 			System.out.println("  asc {-AS3|-ES|-d|-f|-h|-i|-import <filename>|-in <filename>|-m|-p}* filespec");
diff --git a/modules/asc/src/java/macromedia/asc/embedding/Shell.java b/modules/asc/src/java/macromedia/asc/embedding/Shell.java
index 0f6b73a..0dec83a 100644
--- a/modules/asc/src/java/macromedia/asc/embedding/Shell.java
+++ b/modules/asc/src/java/macromedia/asc/embedding/Shell.java
@@ -587,7 +587,7 @@
 	private static void intro()
 	{
 		System.out.println("Actionscript compiler SHell (ash)");
-		System.out.println("Copyright 2016 The Apache Software Foundation");
+		System.out.println("Copyright 2017 The Apache Software Foundation");
 		System.out.println("");
 	}
 
diff --git a/modules/asc/src/java/macromedia/asc/embedding/SwfMaker.java b/modules/asc/src/java/macromedia/asc/embedding/SwfMaker.java
index c7cff7f..961d703 100644
--- a/modules/asc/src/java/macromedia/asc/embedding/SwfMaker.java
+++ b/modules/asc/src/java/macromedia/asc/embedding/SwfMaker.java
@@ -40,6 +40,8 @@
 	public static final int swfFlagsNoCrossdomainCache  = 0x00000004;  // do not add this SWF to the Asset Cache
 	public static final int swfFlagsAS3                 = 0x00000008;  // this SWF contains AVM+ bytecodes
 	public static final int swfFlagsHasMetadata         = 0x00000010;  // this SWF contains stagMetadata somewhere
+    public static final int swfFlagsBrokerLocalConnection = 0x00004000;  // broker local connections
+    public static final int swfFlagsBrokerProductManager = 0x00008000;  // broker product manager
 	// (this is not relevant to the player, but is relevant to search engines)
 	public static final int kDefaultSwfFlags            = 0x00000000;   // these flags are assumed when no stagFileAttributes is present
 
@@ -229,6 +231,8 @@
 		String className = null;
 		int width, height, fps = 12;
         int useNetwork=0;
+        int brokerLocalConnection=0;
+        int brokerProductManager=0;
 
         boolean debug = false;
 		int dAt = options.indexOf(",-g");
@@ -243,6 +247,16 @@
             useNetwork=swfFlagsUseNetwork;
             options = options.substring(0, dAt) + options.substring(dAt+12);
         }
+        dAt = options.indexOf(",-brokerLocalConnection");
+        if (dAt>-1) {
+            brokerLocalConnection=swfFlagsBrokerLocalConnection;
+            options = options.substring(0, dAt) + options.substring(dAt+23);
+        }
+        dAt = options.indexOf(",-brokerProductManager");
+        if (dAt>-1) {
+            brokerProductManager=swfFlagsBrokerProductManager;
+            options = options.substring(0, dAt) + options.substring(dAt+22);
+        }
 
         StringTokenizer tokenizer = new StringTokenizer(options, ",");
 		switch (tokenizer.countTokens())
@@ -282,7 +296,7 @@
 		PutWord(1);       // # of frames  SDD ### Change to sensicle number
 
 		StartTag(stagFileAttributes, false);
-		PutDWord(swfFlagsAS3|useNetwork);
+		PutDWord(swfFlagsAS3|useNetwork|brokerLocalConnection|brokerProductManager);
 		FinishTag();
 
 		if (debug)
diff --git a/modules/compiler/src/java/flex2/compiler/common/Configuration.java b/modules/compiler/src/java/flex2/compiler/common/Configuration.java
index 9c89347..dfc2906 100644
--- a/modules/compiler/src/java/flex2/compiler/common/Configuration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/Configuration.java
@@ -1167,6 +1167,38 @@
         this.useNetwork = b;
     }
 
+    //
+    // 'broker-local-connection' option
+    //
+    
+    private boolean brokerLocalConnection;
+    
+    public boolean brokerLocalConnection()
+    {
+        return brokerLocalConnection;
+    }
+    
+    public void cfgBrokerLocalConnection( ConfigurationValue cv, boolean b)
+    {
+        this.brokerLocalConnection = b;
+    }
+    
+    //
+    // 'broker-product-manager' option
+    //
+    
+    private boolean brokerProductManager;
+    
+    public boolean brokerProductManager()
+    {
+        return brokerProductManager;
+    }
+    
+    public void cfgBrokerProductManager( ConfigurationValue cv, boolean b)
+    {
+        this.brokerProductManager = b;
+    }
+    
     
 
 	/**
diff --git a/modules/compiler/src/java/flex2/linker/LinkerConfiguration.java b/modules/compiler/src/java/flex2/linker/LinkerConfiguration.java
index 28dd782..75adf5c 100644
--- a/modules/compiler/src/java/flex2/linker/LinkerConfiguration.java
+++ b/modules/compiler/src/java/flex2/linker/LinkerConfiguration.java
@@ -47,6 +47,10 @@
 
 	boolean useNetwork();
 
+    boolean brokerLocalConnection();
+    
+    boolean brokerProductManager();
+    
 	boolean lazyInit();
 
     boolean scriptLimitsSet();
diff --git a/modules/compiler/src/java/flex2/linker/SimpleMovie.java b/modules/compiler/src/java/flex2/linker/SimpleMovie.java
index fe59138..8a0f138 100644
--- a/modules/compiler/src/java/flex2/linker/SimpleMovie.java
+++ b/modules/compiler/src/java/flex2/linker/SimpleMovie.java
@@ -128,6 +128,16 @@
 	            fileAttributes.actionScript3 = (version >= 9);
             }
             
+            if (configuration.brokerLocalConnection())
+            {
+                fileAttributes.brokerLocalConnection = true;
+            }
+            
+            if (configuration.brokerProductManager())
+            {
+                fileAttributes.brokerProductManager = true;
+            }
+            
             if (configuration.getAdvancedTelemetry()) {
             	enableTelemetry.enabled = true;
             }
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_da.properties b/modules/compiler/src/java/flex2/tools/ASDoc_da.properties
index aa0fdf7..ea7cca6 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_da.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_da.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Dokumentationen er oprettet i ${location}
 ValidationMessage=Der blev fundet tekst med forkert format. Der er flere oplysninger i ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_de.properties b/modules/compiler/src/java/flex2/tools/ASDoc_de.properties
index 2cf7653..59303a3 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_de.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_de.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Dokumentation wurde erstellt unter: ${location}
 ValidationMessage=Gefundener nicht wohlgeformter Text. Zu Details siehe ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_en.properties b/modules/compiler/src/java/flex2/tools/ASDoc_en.properties
index fb1cf7f..c823aba 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_en.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_en.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Documentation was created in ${location}
 ValidationMessage=Encountered not well-formed text. Please see ${file} for details.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_es.properties b/modules/compiler/src/java/flex2/tools/ASDoc_es.properties
index 65fa11a..9b98c5f 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_es.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_es.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=La documentaci\u00f3n se cre\u00f3 en ${location}
 ValidationMessage=Se ha encontrado texto con formato incorrecto. Consulte ${file} para ver los detalles.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_fi.properties b/modules/compiler/src/java/flex2/tools/ASDoc_fi.properties
index b94bec0..6520248 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_fi.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_fi.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Dokumentaatio luotiin hakemistoon ${location}
 ValidationMessage=Kohdattiin teksti, jota ei ole muodostettu hyvin. Katso lis\u00e4tietoja tiedostosta ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_fr.properties b/modules/compiler/src/java/flex2/tools/ASDoc_fr.properties
index 9933414..e84dbe0 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_fr.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_fr.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=La documentation a \u00e9t\u00e9 cr\u00e9\u00e9e sous ${location}.
 ValidationMessage=Texte incorrectement mis en forme rencontr\u00e9. Veuillez consulter ${file} pour plus de d\u00e9tails.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_it.properties b/modules/compiler/src/java/flex2/tools/ASDoc_it.properties
index a6bb88e..f0d0c20 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_it.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_it.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=La documentazione \u00e8 stata creata in ${location}
 ValidationMessage=Rilevato testo non ben formato. Vedere ${file} per ulteriori dettagli.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_ja.properties b/modules/compiler/src/java/flex2/tools/ASDoc_ja.properties
index 3a778c4..b790734 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_ja.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_ja.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306f ${location} \u306b\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f
 ValidationMessage=\u9069\u683c\u306a\u5f62\u5f0f\u3067\u306a\u3044\u30c6\u30ad\u30b9\u30c8\u304c\u691c\u51fa\u3055\u308c\u307e\u3057\u305f\u3002\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001${file} \u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_ko.properties b/modules/compiler/src/java/flex2/tools/ASDoc_ko.properties
index 1f7dfab..bb4e30e 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_ko.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_ko.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=${location}\uc5d0\uc11c \uc791\uc131\ub41c \ubb38\uc11c
 ValidationMessage=\uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \ud615\uc2dd\uc758 \ud14d\uc2a4\ud2b8\uc785\ub2c8\ub2e4. \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 ${file}\uc744(\ub97c) \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_nb.properties b/modules/compiler/src/java/flex2/tools/ASDoc_nb.properties
index e149dd2..53bebcf 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_nb.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_nb.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Dokumentasjon ble opprettet i ${location}
 ValidationMessage=Fant tekst som ikke er godt utformet. Se i ${file} hvis du vil vite mer.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_nl.properties b/modules/compiler/src/java/flex2/tools/ASDoc_nl.properties
index 023c4e3..d89845a 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_nl.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_nl.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Documentatie is gemaakt in ${location}
 ValidationMessage=Onjuist opgemaakte tekst aangetroffen. Zie ${file} voor details.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_pt.properties b/modules/compiler/src/java/flex2/tools/ASDoc_pt.properties
index da6e452..fe3ef58 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_pt.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_pt.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=A documenta\u00e7\u00e3o foi criada em ${location}
 ValidationMessage=Foi encontrado um texto que n\u00e3o est\u00e1 bem-formado. Para obter detalhes, consulte ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_ru.properties b/modules/compiler/src/java/flex2/tools/ASDoc_ru.properties
index 3088bdb..1f124bd 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_ru.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_ru.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0430 \u0432 \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438 ${location}
 ValidationMessage=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e \u043e\u0442\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0442\u0435\u043a\u0441\u0442. \u0421\u043c. \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0432 \u0444\u0430\u0439\u043b\u0435 ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_sv.properties b/modules/compiler/src/java/flex2/tools/ASDoc_sv.properties
index 3482ce1..f70417a 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_sv.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_sv.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Dokumentationen har skapats i ${location}
 ValidationMessage=Felaktigt formaterad text uppt\u00e4cktes. Mer information finns i ${file}.
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_zh_CN.properties b/modules/compiler/src/java/flex2/tools/ASDoc_zh_CN.properties
index fde9b8a..e40b158 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_zh_CN.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_zh_CN.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u6587\u6863\u521b\u5efa\u5728\u201c${location}\u201d\u4e2d
 ValidationMessage=\u9047\u5230\u683c\u5f0f\u9519\u8bef\u7684\u6587\u672c\u3002\u6709\u5173\u8be6\u7ec6\u4fe1\u606f\uff0c\u8bf7\u53c2\u9605 ${file}\u3002
diff --git a/modules/compiler/src/java/flex2/tools/ASDoc_zh_TW.properties b/modules/compiler/src/java/flex2/tools/ASDoc_zh_TW.properties
index 9ff24b4..7a8eb5c 100644
--- a/modules/compiler/src/java/flex2/tools/ASDoc_zh_TW.properties
+++ b/modules/compiler/src/java/flex2/tools/ASDoc_zh_TW.properties
@@ -18,6 +18,6 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of ASDoc
-StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex ASDoc \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u6587\u4ef6\u5efa\u7acb\u65bc\u201c${location}\u201d
 ValidationMessage=\u9047\u5230\u683c\u5f0f\u4e0d\u6b63\u78ba\u7684\u6587\u5b57\u3002\u8acb\u53c3\u95b1 ${file} \u4ee5\u7372\u53d6\u8a73\u7d30\u8cc7\u8a0a\u3002
diff --git a/modules/compiler/src/java/flex2/tools/Compc_da.properties b/modules/compiler/src/java/flex2/tools/Compc_da.properties
index 592ca1c..6c18e8c 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_da.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_da.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} er opdateret og skal ikke bygges igen.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_de.properties b/modules/compiler/src/java/flex2/tools/Compc_de.properties
index 426546f..d4b6f70 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_de.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_de.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} ist auf dem aktuellen Stand und muss nicht neu erstellt werden.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_en.properties b/modules/compiler/src/java/flex2/tools/Compc_en.properties
index db2111a..8b93a71 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_en.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_en.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} is up-to-date and does not have to be rebuilt.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_es.properties b/modules/compiler/src/java/flex2/tools/Compc_es.properties
index b2d6e99..cd025d2 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_es.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_es.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est\u00e1 actualizado y no necesita ser reconstruido.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_fi.properties b/modules/compiler/src/java/flex2/tools/Compc_fi.properties
index 5c1864e..84da670 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_fi.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_fi.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} on ajan tasalla, eik\u00e4 sit\u00e4 tarvitse muodostaa uudelleen.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_fr.properties b/modules/compiler/src/java/flex2/tools/Compc_fr.properties
index ae55317..5c41752 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_fr.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_fr.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est \u00e0 jour et n'a pas besoin d'\u00eatre r\u00e9g\u00e9n\u00e9r\u00e9.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_it.properties b/modules/compiler/src/java/flex2/tools/Compc_it.properties
index 6218a1c..6a5143a 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_it.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_it.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u00e8 aggiornato e non \u00e8 necessario rigenerarlo.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_ja.properties b/modules/compiler/src/java/flex2/tools/Compc_ja.properties
index 9d541c1..60f59b1 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_ja.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_ja.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u306f\u6700\u65b0\u3067\u3059\u3002\u30ea\u30d3\u30eb\u30c9\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/modules/compiler/src/java/flex2/tools/Compc_ko.properties b/modules/compiler/src/java/flex2/tools/Compc_ko.properties
index d4a5a8a..cf591d6 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_ko.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_ko.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name}\uc740(\ub294) \ucd5c\uc2e0 \ubc84\uc804\uc774\ubbc0\ub85c \ub2e4\uc2dc \ube4c\ub4dc\ud560 \ud544\uc694\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_nb.properties b/modules/compiler/src/java/flex2/tools/Compc_nb.properties
index 3f99439..1898f9e 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_nb.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_nb.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} er oppdatert og trenger ikke \u00e5 bygges p\u00e5 nytt.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_nl.properties b/modules/compiler/src/java/flex2/tools/Compc_nl.properties
index b818bca..518d247 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_nl.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_nl.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} is up-to-date en hoeft niet opnieuw te worden gemaakt.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_pt.properties b/modules/compiler/src/java/flex2/tools/Compc_pt.properties
index 211c748..cd13a23 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_pt.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_pt.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est\u00e1 atualizado e n\u00e3o \u00e9 preciso recri\u00e1-lo.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_ru.properties b/modules/compiler/src/java/flex2/tools/Compc_ru.properties
index c9b7873..5b3d7f2 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_ru.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_ru.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0430\u043a\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u043c \u0438 \u043d\u0435 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0438.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_sv.properties b/modules/compiler/src/java/flex2/tools/Compc_sv.properties
index eed5e34..3b313ac 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_sv.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_sv.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u00e4r uppdaterat och beh\u00f6ver inte kompileras om.
diff --git a/modules/compiler/src/java/flex2/tools/Compc_zh_CN.properties b/modules/compiler/src/java/flex2/tools/Compc_zh_CN.properties
index 9371f52..ed84f6b 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_zh_CN.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_zh_CN.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u662f\u6700\u65b0\u7684\uff0c\u4e0d\u5fc5\u91cd\u5efa\u3002
diff --git a/modules/compiler/src/java/flex2/tools/Compc_zh_TW.properties b/modules/compiler/src/java/flex2/tools/Compc_zh_TW.properties
index 4332ebc..319a3da 100644
--- a/modules/compiler/src/java/flex2/tools/Compc_zh_TW.properties
+++ b/modules/compiler/src/java/flex2/tools/Compc_zh_TW.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of Compc
-StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex compc (Component Compiler)\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u662f\u6700\u65b0\u7684\uff0c\u4e0d\u9700\u8981\u91cd\u5efa\u3002
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_da.properties b/modules/compiler/src/java/flex2/tools/DigestTool_da.properties
index ace91ff..4db3563 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_da.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_da.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Digestoplysninger er opdateret i ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_de.properties b/modules/compiler/src/java/flex2/tools/DigestTool_de.properties
index 84fb743..18b1872 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_de.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_de.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Digest-Informationen wurden aktualisiert unter ${location}.
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_en.properties b/modules/compiler/src/java/flex2/tools/DigestTool_en.properties
index 4eebd5c..9d16933 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_en.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_en.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Digest information was updated in ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_es.properties b/modules/compiler/src/java/flex2/tools/DigestTool_es.properties
index b763f44..406bf0e 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_es.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_es.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=La informaci\u00f3n de compendio se actualiz\u00f3 en ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_fi.properties b/modules/compiler/src/java/flex2/tools/DigestTool_fi.properties
index 177c20d..105f50e 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_fi.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_fi.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Yhteenvetotiedot p\u00e4ivitettiin hakemistoon ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_fr.properties b/modules/compiler/src/java/flex2/tools/DigestTool_fr.properties
index 2fca3a6..0f34d94 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_fr.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_fr.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Les informations de pr\u00e9traitement ont \u00e9t\u00e9 mises \u00e0 jour dans ${location}.
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_it.properties b/modules/compiler/src/java/flex2/tools/DigestTool_it.properties
index 3967ec0..b99f550 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_it.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_it.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Le informazioni del digest sono state aggiornate in ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_ja.properties b/modules/compiler/src/java/flex2/tools/DigestTool_ja.properties
index 14ecedf..b7b192a 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_ja.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_ja.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u30c0\u30a4\u30b8\u30a7\u30b9\u30c8\u60c5\u5831\u306f ${location} \u3067\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_ko.properties b/modules/compiler/src/java/flex2/tools/DigestTool_ko.properties
index 68087d6..fb718c7 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_ko.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_ko.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=${location}\uc5d0\uc11c \ub2e4\uc774\uc81c\uc2a4\ud2b8 \uc815\ubcf4\uac00 \uc5c5\ub370\uc774\ud2b8\ub428
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_nb.properties b/modules/compiler/src/java/flex2/tools/DigestTool_nb.properties
index 835eebf..8ee5847 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_nb.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_nb.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Sammendragsinformasjon ble oppdatert i ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_nl.properties b/modules/compiler/src/java/flex2/tools/DigestTool_nl.properties
index 63c6412..cb63bc2 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_nl.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_nl.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Digestinformatie is bijgewerkt in ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_pt.properties b/modules/compiler/src/java/flex2/tools/DigestTool_pt.properties
index 75a893b..63f016e 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_pt.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_pt.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=As informa\u00e7\u00f5es de compila\u00e7\u00e3o foram atualizadas em ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_ru.properties b/modules/compiler/src/java/flex2/tools/DigestTool_ru.properties
index 97886e0..5aeea36 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_ru.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_ru.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0434\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0432 \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0438 ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_sv.properties b/modules/compiler/src/java/flex2/tools/DigestTool_sv.properties
index bf083fb..32e2b78 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_sv.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_sv.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=Sammanfattningsinformationen uppdaterades i ${location}
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_zh_CN.properties b/modules/compiler/src/java/flex2/tools/DigestTool_zh_CN.properties
index 243ab5f..97f2a41 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_zh_CN.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_zh_CN.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u5728\u201c${location}\u201d\u4e2d\u66f4\u65b0\u4e86\u6458\u8981\u4fe1\u606f
diff --git a/modules/compiler/src/java/flex2/tools/DigestTool_zh_TW.properties b/modules/compiler/src/java/flex2/tools/DigestTool_zh_TW.properties
index c3c4738..766a450 100644
--- a/modules/compiler/src/java/flex2/tools/DigestTool_zh_TW.properties
+++ b/modules/compiler/src/java/flex2/tools/DigestTool_zh_TW.properties
@@ -18,5 +18,5 @@
 ################################################################################
 
 # localization strings for messages defined as inner classes of DigestTool
-StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex digest \n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 OutputMessage=\u6458\u8981\u8cc7\u8a0a\u5df2\u5728\u201c${location}\u201d\u4e2d\u66f4\u65b0
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_da.properties b/modules/compiler/src/java/flex2/tools/Fcsh_da.properties
index 1ede1d2..2bf2e5e 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_da.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_da.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter} er tildelt som kompileringsprogrammets m\u00e5l-id
 DetectConfigurationChange=Der er fundet konfigurations\u00e6ndringer. Kompiler igen...
 NoChange=Intet er \u00e6ndret siden seneste kompilering. Ignorer...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Liste over fcsh-kommandoer:\nmxmlc arg1 arg2 ...      fuld kompilering og optimering, der returnerer et m\u00e5l-id\ncompc arg1 arg2 ...      fuld SWC-kompilering\ncompile id               trinvis kompilering\nclear [id]               ryd m\u00e5l\ninfo [id]                vis oplysninger om kompileringsm\u00e5l\nquit                     afslut
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_de.properties b/modules/compiler/src/java/flex2/tools/Fcsh_de.properties
index 0a1a8c2..86c0d4d 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_de.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_de.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter} als Kompilierungsziel-ID zugewiesen
 DetectConfigurationChange=Konfigurations\u00e4nderungen wurden gefunden. Neukompilierung wird ausgef\u00fchrt...
 NoChange=Keine \u00c4nderungen seit der letzten Kompilierung. \u00dcberspringen...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Liste der fcsh-Befehle:\nmxmlc arg1 arg2 ...      vollst\u00e4ndige Kompilierung und Optimierung; R\u00fcckgabe einer Ziel-ID\ncompc arg1 arg2 ...      vollst\u00e4ndige SWC-Kompilierung\ncompile id               inkrementelle Kompilierung\nclear [id]               Ziel(e) l\u00f6schen\ninfo [id]                Anzeige von Informationen zum Kompilierungsziel\nquit                     Beenden
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_en.properties b/modules/compiler/src/java/flex2/tools/Fcsh_en.properties
index 2efe5da..cfa4f6e 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_en.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_en.properties
@@ -22,7 +22,7 @@
 AssignTargetID=fcsh: Assigned ${counter} as the compile target id
 DetectConfigurationChange=Detected configuration changes. Recompile...
 NoChange=Nothing has changed since the last compile. Skip...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=List of fcsh commands:\n\
 mxmlc arg1 arg2 ...      full compilation and optimization; return a target id\n\
 compc arg1 arg2 ...      full SWC compilation\n\
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_es.properties b/modules/compiler/src/java/flex2/tools/Fcsh_es.properties
index d6f952d..d6950d5 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_es.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_es.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: Se asign\u00f3 ${counter} como el Id. de destino de compilaci\u00f3n
 DetectConfigurationChange=Se han detectado cambios de configuraci\u00f3n. Volver a compilar...
 NoChange=No se ha realizado ning\u00fan cambio desde la \u00faltima compilaci\u00f3n. Omitir...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Lista de comandos fcsh:\nmxmlc arg1 arg2 ...      full compilation and optimization; return a target id\ncompc arg1 arg2 ...      full SWC compilation\ncompile id               incremental compilation\nclear [id]               clear target(s)\ninfo [id]                display compile target info\nquit                     quit
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_fi.properties b/modules/compiler/src/java/flex2/tools/Fcsh_fi.properties
index 6e0e4ba..de0b8b2 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_fi.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_fi.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh:Kokoamisen kohdetunnukseksi m\u00e4\u00e4ritettiin ${counter}
 DetectConfigurationChange=M\u00e4\u00e4ritysmuutoksia havaittiin. Kokoa uudelleen...
 NoChange=Mit\u00e4\u00e4n ei ole muuttunut edellisen kokoamisen j\u00e4lkeen. Ohita...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=fcsh-komentojen luettelo:\nmxmlc arg1 arg2 ...      t\u00e4ysi kokoaminen ja optimointi, palauta kohdetunnus\ncompc arg1 arg2 ...      t\u00e4ysi SWC-kokoaminen\ncompile id               asteittainen kokoaminen\nclear [id]               tyhjenn\u00e4 kohde/kohteet\ninfo [id]                n\u00e4yt\u00e4 kokoamisen kohdetiedot\nquit                     lopeta
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_fr.properties b/modules/compiler/src/java/flex2/tools/Fcsh_fr.properties
index 54db248..41ee9d4 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_fr.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_fr.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh : ${counter} attribu\u00e9 en tant qu'ID cible de compilation
 DetectConfigurationChange=Changements de configuration d\u00e9tect\u00e9s. Recompilation en cours...
 NoChange=Rien n'a chang\u00e9 depuis la derni\u00e8re compilation. Op\u00e9ration ignor\u00e9e...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Liste de commandes fcsh :\nmxmlc arg1 arg2 ...      compilation et optimisation compl\u00e8tes ; renvoi d'un ID cible\ncompc arg1 arg2 ...      compilation SWC compl\u00e8te\nID de compilation               compilation incr\u00e9mentielle\nclear [id]               suppression de cible(s)\ninfo [id]                affichage des infos cibles de compilation\nquit                     sortie
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_it.properties b/modules/compiler/src/java/flex2/tools/Fcsh_it.properties
index 5d4d3ba..c214b75 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_it.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_it.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: assegnato ${counter} come ID della destinazione di compilazione
 DetectConfigurationChange=Rilevate modifiche della configurazione. Ricompilazione in corso...
 NoChange=Dopo l'ultima compilazione non \u00e8 stata apportata alcuna modifica. L'operazione verr\u00e0 ignorata.
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Elenco dei comandi fcsh:\nmxmlc arg1 arg2 ...      compilazione completa e ottimizzazione; restituzione di un ID di destinazione\ncompc arg1 arg2 ...      compilazione SWC completa\nID di compilazione               compilazione incrementale\ncancella [ID]               cancella destinazioni\ninformazioni [ID]                visualizza informazioni sulla destinazione della compilazione\nesci                     esci
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_ja.properties b/modules/compiler/src/java/flex2/tools/Fcsh_ja.properties
index cd32933..f73cf62 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_ja.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_ja.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh : \u30b3\u30f3\u30d1\u30a4\u30eb\u30bf\u30fc\u30b2\u30c3\u30c8 ID \u3068\u3057\u3066 ${counter} \u3092\u5272\u308a\u5f53\u3066\u307e\u3057\u305f
 DetectConfigurationChange=\u8a2d\u5b9a\u306e\u5909\u66f4\u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u3057\u307e\u3059...
 NoChange=\u6700\u5f8c\u306e\u30b3\u30f3\u30d1\u30a4\u30eb\u304b\u3089\u306f\u4f55\u3082\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=fcsh \u30b3\u30de\u30f3\u30c9\u306e\u30ea\u30b9\u30c8 : \nmxmlc arg1 arg2 ...      \u5b8c\u5168\u30b3\u30f3\u30d1\u30a4\u30eb\u3068\u6700\u9069\u5316\u3002\u30bf\u30fc\u30b2\u30c3\u30c8 id \u3092\u8fd4\u3057\u307e\u3059\ncompc arg1 arg2 ...      \u5b8c\u5168 SWC \u30b3\u30f3\u30d1\u30a4\u30eb\ncompile id               \u30a4\u30f3\u30af\u30ea\u30e1\u30f3\u30bf\u30eb\u30b3\u30f3\u30d1\u30a4\u30eb\nclear [id]               \u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30af\u30ea\u30a2\ninfo [id]                \u30b3\u30f3\u30d1\u30a4\u30eb\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u60c5\u5831\u3092\u8868\u793a\nquit                     \u7d42\u4e86
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_ko.properties b/modules/compiler/src/java/flex2/tools/Fcsh_ko.properties
index 671063b..98de440 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_ko.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_ko.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter}\uc744(\ub97c) \ucef4\ud30c\uc77c \ub300\uc0c1 ID\ub85c \ud560\ub2f9\ud568
 DetectConfigurationChange=\uad6c\uc131 \ubcc0\uacbd \uc0ac\ud56d\uc774 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.  \ub2e4\uc2dc \ucef4\ud30c\uc77c...
 NoChange=\ub9c8\uc9c0\ub9c9\uc73c\ub85c \ucef4\ud30c\uc77c\ud55c \ud6c4 \ubcc0\uacbd \uc0ac\ud56d\uc774 \uc5c6\uc2b5\ub2c8\ub2e4. \uac74\ub108\ub6f0\uae30...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=fcsh \uba85\ub839 \ubaa9\ub85d:\nmxmlc arg1 arg2 ...      \uc804\uccb4 \ucef4\ud30c\uc77c \ubc0f \ucd5c\uc801\ud654, \ub300\uc0c1 ID \ubc18\ud658\ncompc arg1 arg2 ...      \uc804\uccb4 SWC \ucef4\ud30c\uc77c\n\ucef4\ud30c\uc77c ID               \uc99d\ubd84 \ucef4\ud30c\uc77c\n\uc9c0\uc6b0\uae30 [ID]               \ub300\uc0c1 \uc9c0\uc6b0\uae30\n\uc815\ubcf4 [ID]                \ucef4\ud30c\uc77c \ub300\uc0c1 \uc815\ubcf4 \ud45c\uc2dc\n\uc885\ub8cc                     \uc885\ub8cc
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_nb.properties b/modules/compiler/src/java/flex2/tools/Fcsh_nb.properties
index 9a04f8f..3e1e133 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_nb.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_nb.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: Tilordnet ${counter} som kompileringsm\u00e5l-ID
 DetectConfigurationChange=Oppdaget konfigurasjonsendringer. Kompiler p\u00e5 nytt...
 NoChange=Ingenting er endret siden forrige kompilering. Hopp over...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Liste over fcsh-kommandoer:\nmxmlc arg1 arg2 ...      full kompilering og optimering; returner en m\u00e5l-ID\ncompc arg1 arg2 ...      full swc-kompilering\ncompile id               trinnvis kompilering\nclear [id]               fjern m\u00e5l\ninfo [id]                vis info om kompileringsm\u00e5l\nquit                     avslutt
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_nl.properties b/modules/compiler/src/java/flex2/tools/Fcsh_nl.properties
index 495bd67..5e8e8d9 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_nl.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_nl.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter} toegewezen als de compileerdoel-ID
 DetectConfigurationChange=Configuratiewijzigingen gedetecteerd. Opnieuw compileren...
 NoChange=Er is niets gewijzigd sinds de laatste compileerbewerking. Overslaan...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Lijst met fcsh-opdrachten:\nmxmlc arg1 arg2 ...      volledige compilatie en optimalisatie; retourneert een doel-id\ncompc arg1 arg2 ...      volledige swc-compilatie\ncompile id               incrementele compilatie\nclear [id]               doel(en) wissen\ninfo [id]                compileerdoelinfo weergeven\nquit                     afsluiten
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_pt.properties b/modules/compiler/src/java/flex2/tools/Fcsh_pt.properties
index 2a2292f..0fe042b 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_pt.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_pt.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter} atribu\u00eddo como id de destino da compila\u00e7\u00e3o
 DetectConfigurationChange=Foram detectadas altera\u00e7\u00f5es na configura\u00e7\u00e3o. Recompilar...
 NoChange=Nada foi alterado desde a \u00faltima compila\u00e7\u00e3o. Ignorar...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Lista de comandos fcsh:\nmxmlc arg1 arg2 ...      compila\u00e7\u00e3o e otimiza\u00e7\u00e3o total; retornar uma id de destino\ncompc arg1 arg2 ...      compila\u00e7\u00e3o SWC total\ncompile id               compila\u00e7\u00e3o incremental\nclear [id]               limpar destino(s)\ninfo [id]                exibir informa\u00e7\u00f5es de destino de compila\u00e7\u00e3o\nquit                     sair
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_ru.properties b/modules/compiler/src/java/flex2/tools/Fcsh_ru.properties
index 8f049ab..176b200 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_ru.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_ru.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: ${counter} \u043f\u0440\u0438\u0441\u0432\u043e\u0435\u043d \u043a\u0430\u043a \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0446\u0435\u043b\u0438 \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438
 DetectConfigurationChange=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438. \u041f\u0435\u0440\u0435\u043a\u043e\u043c\u043f\u0438\u043b\u0438\u0440\u043e\u0432\u0430\u0442\u044c...
 NoChange=\u041f\u043e\u0441\u043b\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0439 \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0442. \u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=\u0421\u043f\u0438\u0441\u043e\u043a \u043a\u043e\u043c\u0430\u043d\u0434 fcsh:\nmxmlc arg1 arg2 ...      \u043f\u043e\u043b\u043d\u0430\u044f \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u044f \u0438 \u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0430\u0446\u0438\u044f; \u0432\u043e\u0437\u0432\u0440\u0430\u0442 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 \u0446\u0435\u043b\u0438\ncompc arg1 arg2 ...      \u043f\u043e\u043b\u043d\u0430\u044f \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u044f SWC\ncompile id             \u0438\u043d\u043a\u0440\u0435\u043c\u0435\u043d\u0442\u043d\u0430\u044f \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u044f\nclear [id] \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0446\u0435\u043b\u0435\u0432\u043e\u0433\u043e \u043e\u0431\u044a\u0435\u043a\u0442\u0430(\u043e\u0432)\ninfo [id]                \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u0446\u0435\u043b\u0435\u0432\u043e\u043c \u043e\u0431\u044a\u0435\u043a\u0442\u0435 \u043a\u043e\u043c\u043f\u0438\u043b\u044f\u0446\u0438\u0438\nquit                     \u0432\u044b\u0445\u043e\u0434
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_sv.properties b/modules/compiler/src/java/flex2/tools/Fcsh_sv.properties
index ac7374c..60a6ed0 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_sv.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_sv.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: Tilldelar ${counter} som kompileringsm\u00e5ls-ID
 DetectConfigurationChange=Konfigurations\u00e4ndringar har p\u00e5tr\u00e4ffats. Kompilera om ...
 NoChange=Ingenting har \u00e4ndrats sedan f\u00f6reg\u00e5ende kompilering. Hoppa \u00f6ver...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=Lista \u00f6ver fcsh-kommandon:\nmxmlc arg1 arg2 ...      fullst\u00e4ndig kompilering och optimering; returnera ett m\u00e5l-id\ncompc arg1 arg2 ...      fullst\u00e4ndig SWC-kompilering\ncompile id               stegvis \u00f6kande kompilering\nclear [id]               rensa m\u00e5l\ninfo [id]                visa kompileringsm\u00e5lsinformation\nquit                     st\u00e4ng
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_zh_CN.properties b/modules/compiler/src/java/flex2/tools/Fcsh_zh_CN.properties
index 791f89d..db94451 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_zh_CN.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_zh_CN.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: \u5c06 ${counter} \u6307\u5b9a\u4e3a\u7f16\u8bd1\u76ee\u6807\u6807\u8bc6
 DetectConfigurationChange=\u68c0\u6d4b\u5230\u914d\u7f6e\u66f4\u6539\u3002\u91cd\u65b0\u7f16\u8bd1...
 NoChange=\u81ea\u4e0a\u6b21\u7f16\u8bd1\u4ee5\u6765\u6ca1\u6709\u4efb\u4f55\u66f4\u6539\u3002\u8df3\u8fc7...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=fcsh \u547d\u4ee4\u5217\u8868: \nmxmlc arg1 arg2 ...      \u5b8c\u5168\u7f16\u8bd1\u548c\u4f18\u5316\uff1b\u8fd4\u56de\u4e00\u4e2a\u76ee\u6807\u6807\u8bc6\ncompc arg1 arg2 ...      \u5b8c\u5168 SWC \u7f16\u8bd1\ncompile id               \u589e\u91cf\u7f16\u8bd1\nclear [id]               \u6e05\u9664\u76ee\u6807\ninfo [id]                \u663e\u793a\u7f16\u8bd1\u76ee\u6807\u4fe1\u606f\nquit                     \u9000\u51fa
diff --git a/modules/compiler/src/java/flex2/tools/Fcsh_zh_TW.properties b/modules/compiler/src/java/flex2/tools/Fcsh_zh_TW.properties
index 8639793..3aaf8bb 100644
--- a/modules/compiler/src/java/flex2/tools/Fcsh_zh_TW.properties
+++ b/modules/compiler/src/java/flex2/tools/Fcsh_zh_TW.properties
@@ -22,5 +22,5 @@
 AssignTargetID=fcsh: \u5c07 ${counter} \u6307\u5b9a\u70ba\u7de8\u8b6f\u76ee\u6a19 ID
 DetectConfigurationChange=\u5075\u6e2c\u5230\u7d44\u614b\u8b8a\u66f4\u3002\u91cd\u65b0\u7de8\u8b6f...
 NoChange=\u81ea\u4e0a\u6b21\u7de8\u8b6f\u5f8c\u672a\u767c\u751f\u4efb\u4f55\u8b8a\u66f4\u3002\u7565\u904e...
-ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+ShellMessage=Apache Flex Compiler SHell (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 CommandList=fcsh \u6307\u4ee4\u6e05\u55ae:\nmxmlc arg1 arg2 ...      \u5b8c\u6574\u7de8\u8b6f\u8207\u6700\u4f73\u5316\uff1b\u50b3\u56de\u76ee\u6a19 ID\ncompc arg1 arg2 ...      \u5b8c\u6574 SWC \u7de8\u8b6f\ncompile id               \u589e\u91cf\u7de8\u8b6f\nclear [id]               \u6e05\u9664\u76ee\u6a19\ninfo [id]                \u986f\u793a\u7de8\u8b6f\u76ee\u6a19\u8cc7\u8a0a\nquit                     \u7d50\u675f
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_da.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_da.properties
index e62f75f..c161139 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_da.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_da.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWC'er er indl\u00e6st:
 CouldNotInstantiate=${config} kunne ikke oprettes
 DumpConfig=Skrivning af konfigurationsdump til ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} er opdateret og skal ikke bygges igen.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_de.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_de.properties
index f2de342..0eeaa4b 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_de.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_de.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWC geladen:
 CouldNotInstantiate=${config} konnte nicht instanziiert werden
 DumpConfig=Konfigurations-Dump wird in ${filename} geschrieben
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} ist auf dem aktuellen Stand und muss nicht neu erstellt werden.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_en.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_en.properties
index c1fdf81..c3bc6ab 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_en.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_en.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=Loaded ${num} SWCs:
 CouldNotInstantiate=Could not instantiate ${config}
 DumpConfig=Writing configuration dump to ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} is up-to-date and does not have to be rebuilt.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_es.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_es.properties
index 39771b9..8cf6c1f 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_es.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_es.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWC cargados:
 CouldNotInstantiate=No se pudo crear una instancia de ${config}
 DumpConfig=Escribiendo el volcado de configuraci\u00f3n en ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est\u00e1 actualizado y no necesita ser reconstruido.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_fi.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_fi.properties
index 47cd5e8..c108fbd 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_fi.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_fi.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=Ladattu ${num} SWC:t\u00e4:
 CouldNotInstantiate=Esiintym\u00e4n ${config} luominen ep\u00e4onnistui
 DumpConfig=M\u00e4\u00e4rityslokia kirjoitetaan tiedostoon ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} on ajan tasalla, eik\u00e4 sit\u00e4 tarvitse muodostaa uudelleen.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_fr.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_fr.properties
index ec917ce..3109ca7 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_fr.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_fr.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} fichiers SWC charg\u00e9s :
 CouldNotInstantiate=Impossible d'instancier ${config}
 DumpConfig=Ecriture du vidage de configuration dans ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est \u00e0 jour et n'a pas besoin d'\u00eatre r\u00e9g\u00e9n\u00e9r\u00e9.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_it.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_it.properties
index e5a088f..4381807 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_it.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_it.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWC caricati:
 CouldNotInstantiate=Impossibile creare un\u2019istanza di ${config}
 DumpConfig=Scrittura del dump di configurazione in ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u00e8 aggiornato e non \u00e8 necessario rigenerarlo.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_ja.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_ja.properties
index b8cbd1b..49acf4b 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_ja.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_ja.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} \u500b\u306e SWC \u304c\u8aad\u307f\u8fbc\u307e\u308c\u307e\u3057\u305f :
 CouldNotInstantiate=${config} \u3092\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
 DumpConfig=\u8a2d\u5b9a\u30c0\u30f3\u30d7\u3092 "${filename}" \u306b\u66f8\u304d\u8fbc\u3093\u3067\u3044\u307e\u3059\u3002
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u306f\u6700\u65b0\u3067\u3059\u3002\u30ea\u30d3\u30eb\u30c9\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_ko.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_ko.properties
index 303342e..a9d1bb4 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_ko.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_ko.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num}\uac1c\uc758 SWC \ub85c\ub4dc\ub428:
 CouldNotInstantiate=${config}\uc744(\ub97c) \uc778\uc2a4\ud134\uc2a4\ud654\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DumpConfig=${filename}\uc5d0 \uad6c\uc131 \ub364\ud504 \uc4f0\uae30
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name}\uc740(\ub294) \ucd5c\uc2e0 \ubc84\uc804\uc774\ubbc0\ub85c \ub2e4\uc2dc \ube4c\ub4dc\ud560 \ud544\uc694\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_nb.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_nb.properties
index 9e0805c..8a26ff9 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_nb.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_nb.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=Lastet inn ${num} swc-er:
 CouldNotInstantiate=Kan ikke representere ${config}
 DumpConfig=Skriver konfigurasjonsdump til ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} er oppdatert og trenger ikke \u00e5 bygges p\u00e5 nytt..
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_nl.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_nl.properties
index 9c6ed5c..4868deb 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_nl.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_nl.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWC's geladen:
 CouldNotInstantiate=Kan geen exemplaar maken van ${config}
 DumpConfig=Configuratiedump wordt naar ${filename} geschreven
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} is up-to-date en hoeft niet opnieuw te worden gemaakt.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_pt.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_pt.properties
index 8c2a240..bc2bd8c 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_pt.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_pt.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=${num} SWCs carregados:
 CouldNotInstantiate=N\u00e3o foi poss\u00edvel criar a inst\u00e2ncia ${config}
 DumpConfig=Gravando despejo de configura\u00e7\u00e3o em ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} est\u00e1 atualizado e n\u00e3o \u00e9 preciso recri\u00e1-lo.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_ru.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_ru.properties
index cdbf06b..ecf83b3 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_ru.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_ru.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=\u0417\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043e ${num} SWC:
 CouldNotInstantiate=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c ${config}
 DumpConfig=\u0417\u0430\u043f\u0438\u0441\u044c \u0434\u0430\u043c\u043f\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432 ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0430\u043a\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u043c \u0438 \u043d\u0435 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0438.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_sv.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_sv.properties
index 5e1ac66..f003eec 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_sv.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_sv.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=Laddade ${num} SWC:er:
 CouldNotInstantiate=Det gick inte att skapa en instans av ${config}
 DumpConfig=Skriver konfigurationsdump till ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u00e4r aktuell och beh\u00f6ver inte kompileras om.
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_zh_CN.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_zh_CN.properties
index 0e4066d..274bafa 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_zh_CN.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_zh_CN.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=\u5df2\u52a0\u8f7d ${num} \u4e2a SWC:
 CouldNotInstantiate=\u65e0\u6cd5\u5b9e\u4f8b\u5316 ${config}
 DumpConfig=\u5c06\u914d\u7f6e\u8f6c\u50a8\u5199\u5165 ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u662f\u6700\u65b0\u7684\uff0c\u4e0d\u5fc5\u91cd\u5efa\u3002
diff --git a/modules/compiler/src/java/flex2/tools/Mxmlc_zh_TW.properties b/modules/compiler/src/java/flex2/tools/Mxmlc_zh_TW.properties
index 5a40d1a..d856694 100644
--- a/modules/compiler/src/java/flex2/tools/Mxmlc_zh_TW.properties
+++ b/modules/compiler/src/java/flex2/tools/Mxmlc_zh_TW.properties
@@ -22,5 +22,5 @@
 LoadedSWCs=\u5df2\u8f09\u5165 ${num} \u500b SWC:
 CouldNotInstantiate=\u7121\u6cd5\u5be6\u9ad4\u5316 ${config}
 DumpConfig=\u5c07\u7d44\u614b\u50be\u5370\u5beb\u5165 ${filename}
-StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2016 The Apache Software Foundation.\n
+StartMessage=Apache Flex Compiler (${program})\n${buildMessage}\nCopyright 2017 The Apache Software Foundation.\n
 NoUpdateMessage=${name} \u662f\u6700\u65b0\u7684\uff0c\u4e0d\u9700\u8981\u91cd\u5efa\u3002
diff --git a/modules/compiler/src/java/flex2/tools/flexbuilder/BuilderConfiguration.java b/modules/compiler/src/java/flex2/tools/flexbuilder/BuilderConfiguration.java
index ee0faec..c8edeaf 100644
--- a/modules/compiler/src/java/flex2/tools/flexbuilder/BuilderConfiguration.java
+++ b/modules/compiler/src/java/flex2/tools/flexbuilder/BuilderConfiguration.java
@@ -414,6 +414,16 @@
 		configuration.useNetwork(b);
 	}
 
+    public void brokerProductManager(boolean b)
+    {
+        configuration.brokerProductManager(b);
+    }
+    
+    public void brokerLocalConnection(boolean b)
+    {
+        configuration.brokerLocalConnection(b);
+    }
+    
 	public void useResourceBundleMetaData(boolean b)
 	{
 		configuration.useResourceBundleMetaData(b);
diff --git a/modules/compiler/src/java/flex2/tools/oem/Application.java b/modules/compiler/src/java/flex2/tools/oem/Application.java
index 880e767..d4597fe 100644
--- a/modules/compiler/src/java/flex2/tools/oem/Application.java
+++ b/modules/compiler/src/java/flex2/tools/oem/Application.java
@@ -1734,7 +1734,7 @@
      * Application object the cache may be reused to build another Application
      * object that uses the same library path.
      *
-     * @param swcCache A reference to an allocated swc cache.
+     * @param libraryCache A reference to an allocated swc cache.
      *
      * @since 3.0
      */
diff --git a/modules/compiler/src/java/flex2/tools/oem/Configuration.java b/modules/compiler/src/java/flex2/tools/oem/Configuration.java
index 7aff4a3..8aa120d 100644
--- a/modules/compiler/src/java/flex2/tools/oem/Configuration.java
+++ b/modules/compiler/src/java/flex2/tools/oem/Configuration.java
@@ -141,7 +141,7 @@
     
     /**
      * Sets the location of the default CSS file.
-     * This is equivalent to using the <code>compiler.defaults-css-url</code> option of the mxmlc or compc compilers</code>.
+     * This is equivalent to using the <code>compiler.defaults-css-url</code> option of the mxmlc or compc compilers.
      * 
      * @param url An instance of <code>java.io.File</code>.
      */
@@ -973,12 +973,12 @@
      * the file format:
      * 
      * <pre>
-     * &lt;script>
-     *     &lt;!-- use 'dep', 'pre' or 'dep' to specify a definition to be omitted from linking. -->
-     *     &lt;def id="mx.skins:ProgrammaticSkin"/>
-     *     &lt;pre id="mx.core:IFlexDisplayObject"/>
-     *     &lt;dep id="String"/>
-     * &lt;/script>
+     * &lt;script&gt;
+     *     &lt;!-- use 'dep', 'pre' or 'dep' to specify a definition to be omitted from linking. --&gt;
+     *     &lt;def id="mx.skins:ProgrammaticSkin"/&gt;
+     *     &lt;pre id="mx.core:IFlexDisplayObject"/&gt;
+     *     &lt;dep id="String"/&gt;
+     * &lt;/script&gt;
      * </pre>
      * 
      * @see #setExterns(String[])
@@ -1087,8 +1087,8 @@
      * CONTRIBUTOR      java.lang.String
      * CREATOR          java.lang.String
      * DATE             java.util.Date
-     * DESCRIPTION      java.util.Map<String, String>
-     * TITLE            java.util.Map<String, String>
+     * DESCRIPTION      java.util.Map&lt;String, String&gt;
+     * TITLE            java.util.Map&lt;String, String&gt;
      * LANGUAGE         java.lang.String
      * PUBLISHER        java.lang.String
      * </pre>
@@ -1174,6 +1174,28 @@
     void useNetwork(boolean b);
     
     /**
+     * Toggles whether the application SWF is flagged broker local connections.
+     * This is equivalent to the <code>broker-local-connection</code> option of the mxmlc or compc compilers.
+     *
+     * <p>
+     * The default value is <code>true</code>.
+     *
+     * @param b Boolean value.
+     */
+    void brokerLocalConnection(boolean b);
+    
+    /**
+     * Toggles whether the application SWF is flagged to broker product manager.
+     * This is equivalent to the <code>broker-product-manager</code> option of the mxmlc or compc compilers.
+     *
+     * <p>
+     * The default value is <code>true</code>.
+     *
+     * @param b Boolean value.
+     */
+    void brokerProductManager(boolean b);
+    
+    /**
      * Set the default output directory for configuration settings.
      * 
      */
@@ -1331,7 +1353,7 @@
     
     
     /**
-     * @param libraries
+     * @param extensions
      */
     public void setExtensionLibraries(Map<File, List<String>> extensions);
     
@@ -1382,7 +1404,7 @@
      * instance should represent a SWC file. May not be null.
      *    
      * @since 4.5
-     * @see #setForcedRuntimeSharedLibraryPaths(File[])
+     * @see #setForceRuntimeSharedLibraryPaths(File[])
      * @throws NullPointerException if path is null.
      */
     void addForceRuntimeSharedLibraryPaths(File[] paths);
diff --git a/modules/compiler/src/java/flex2/tools/oem/Library.java b/modules/compiler/src/java/flex2/tools/oem/Library.java
index bd72e5d..3092a78 100644
--- a/modules/compiler/src/java/flex2/tools/oem/Library.java
+++ b/modules/compiler/src/java/flex2/tools/oem/Library.java
@@ -2155,7 +2155,7 @@
      * Library object, the cache may be reused to build another
      * Library or Application object that uses the same library path.
      *
-     * @param swcCache A reference to an allocated swc cache.
+     * @param libraryCache A reference to an allocated swc cache.
      *
      * @since 3.0
      */
diff --git a/modules/compiler/src/java/flex2/tools/oem/Toolkit.java b/modules/compiler/src/java/flex2/tools/oem/Toolkit.java
index f074cb9..04bfada 100644
--- a/modules/compiler/src/java/flex2/tools/oem/Toolkit.java
+++ b/modules/compiler/src/java/flex2/tools/oem/Toolkit.java
@@ -303,7 +303,7 @@
 	 * This operation returns an optimized version of the library SWF. The SWF in the library
 	 * remains unchanged.
 	 * 
-	 * @param in a SWF input stream
+	 * @param lib a SWF input stream
 	 * @param out a SWF output stream
 	 * @return the number of bytes written to the output stream; <code>0</code> if the optimization fails.
 	 */
@@ -496,7 +496,7 @@
      * @param minimizeDependencySet If false, all of the libraries dependencies are returned. If true, the external script
      * classes are reviewed. If the set of script classes resolved in a libraryA is a subset of the script
      * classes resolved in libraryB, then libraryA will be removed as a dependency of targetLibrary.
-     * @param dependencyTypes The types of dependencies to consider when 
+     * @param dependencySet The types of dependencies to consider when 
      * determining the library's dependencies. If this parameter is null or an empty set, then all
      * dependencies will be considered. 
      * @return A set of Strings; where each String is the location of a library in the file system. 
diff --git a/modules/compiler/src/java/flex2/tools/oem/internal/ConfigurationConstants.java b/modules/compiler/src/java/flex2/tools/oem/internal/ConfigurationConstants.java
index c167982..30696b0 100644
--- a/modules/compiler/src/java/flex2/tools/oem/internal/ConfigurationConstants.java
+++ b/modules/compiler/src/java/flex2/tools/oem/internal/ConfigurationConstants.java
@@ -27,6 +27,8 @@
 interface ConfigurationConstants
 {
     String USE_NETWORK                                          = "--use-network";
+    String BROKER_LOCAL_CONNECTION                              = "--broker-local-connection";
+    String BROKER_PRODUCT_MANAGER                               = "--broker-product-manager";
     String RUNTIME_SHARED_LIBRARIES                             = "--runtime-shared-libraries";
     String RAW_METADATA                                         = "--raw-metadata";
     String PROJECTOR                                            = "--projector";
diff --git a/modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java b/modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java
index 946b747..e20787c 100644
--- a/modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java
+++ b/modules/compiler/src/java/flex2/tools/oem/internal/LinkerConfiguration.java
@@ -338,6 +338,30 @@
 		}
 	}
 
+    public boolean brokerProductManager()
+    {
+        if (args.contains(ConfigurationConstants.BROKER_PRODUCT_MANAGER))
+        {
+            return super.brokerProductManager();
+        }
+        else
+        {
+            return original.brokerProductManager();
+        }
+    }
+    
+    public boolean brokerLocalConnection()
+    {
+        if (args.contains(ConfigurationConstants.BROKER_LOCAL_CONNECTION))
+        {
+            return super.brokerLocalConnection();
+        }
+        else
+        {
+            return original.brokerLocalConnection();
+        }
+    }
+    
 	public String width()
 	{
 		return original.width();
diff --git a/modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java b/modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java
index 3afdd12..7cade9c 100644
--- a/modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java
+++ b/modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java
@@ -1931,6 +1931,34 @@
 		newLinkerOptionsAfterCompile.add(USE_NETWORK);
 	}
 	
+    /**
+     * Toggles whether the application SWF is has the broker-local-connection bit set.
+     * This is equivalent to using <code>mxmlc/compc --broker-local-connection</code>.
+     * By default, it is set to <code>false</code>.
+     *
+     * @param b boolean value
+     */
+    public void brokerLocalConnection(boolean b)
+    {
+        args.put(BROKER_LOCAL_CONNECTION, b ? Boolean.TRUE : Boolean.FALSE);
+        linker_args.put(BROKER_LOCAL_CONNECTION, b ? Boolean.TRUE : Boolean.FALSE);
+        newLinkerOptionsAfterCompile.add(BROKER_LOCAL_CONNECTION);
+    }
+    
+    /**
+     * Toggles whether the application SWF is has the broker-product-manager bit set.
+     * This is equivalent to using <code>mxmlc/compc --broker-product-manager</code>.
+     * By default, it is set to <code>false</code>.
+     *
+     * @param b boolean value
+     */
+    public void brokerProductManager(boolean b)
+    {
+        args.put(BROKER_PRODUCT_MANAGER, b ? Boolean.TRUE : Boolean.FALSE);
+        linker_args.put(BROKER_PRODUCT_MANAGER, b ? Boolean.TRUE : Boolean.FALSE);
+        newLinkerOptionsAfterCompile.add(BROKER_PRODUCT_MANAGER);
+    }
+    
 	/**
 	 * Defines a token. mxmlc and compc support token substitutions. For example,
 	 * 
@@ -2353,6 +2381,8 @@
 		setSWFMetaData(c.getMetadata());
 		setRuntimeSharedLibraries(toStrings(c.getRuntimeSharedLibraries()));
 		useNetwork(c.useNetwork());
+        brokerLocalConnection(c.brokerLocalConnection());
+        brokerProductManager(c.brokerProductManager());
 		
 		// useMobileFramework();
 		
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_da.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_da.properties
index 0e2d506..ec86542 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_da.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_da.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=development
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. Alle rettigheder forbeholdes.
+copyright=Copyright 2017 The Apache Software Foundation. Alle rettigheder forbeholdes.
 noResponseException=Afspilleren reagerede ikke som forventet p\u00e5 kommandoen; kommandoen er afbrudt.
 notSuspendedException=Kommandoen kan ikke afgives mens afspilleren k\u00f8rer
 illegalStateException=Kommandoen fungerer ikke uden for en session.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_de.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_de.properties
index ee9cdf1..3b4b64c 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_de.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_de.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=development
 about=Apache FDB (Flash Player Debugger) [Build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Der Player hat nicht wie erwartet auf den Befehl reagiert; der Befehl wird abgebrochen.
 notSuspendedException=Der Befehl kann nicht ausgestellt werden, w\u00e4hrend der Player ausgef\u00fchrt wird
 illegalStateException=Der Befehl ist ohne Sitzung nicht zul\u00e4ssig.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_en.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_en.properties
index 4fadd11..7d317fd 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_en.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_en.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=development
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player did not respond to the command as expected; command aborted.
 notSuspendedException=Command cannot be issued while Player is running
 illegalStateException=Command not valid without a session.
@@ -271,4 +271,4 @@
 key35=in '${swfName}'
 atAddress=at ${address}
 haltedDueToFault=due to ${fault}
-noWorkersRunning=There are no workers running.
\ No newline at end of file
+noWorkersRunning=There are no workers running.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_es.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_es.properties
index b972575..1cdb80b 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_es.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_es.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=desarrollo
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. Reservados todos los derechos.
+copyright=Copyright 2017 The Apache Software Foundation. Reservados todos los derechos.
 noResponseException=El reproductor no respondi\u00f3 al comando como se esperaba; se cancel\u00f3 el comando.
 notSuspendedException=No puede emitirse el comando mientras el reproductor se est\u00e1 ejecutando.
 illegalStateException=El comando no es v\u00e1lido sin una sesi\u00f3n.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fi.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fi.properties
index 9d3f6b9..7e177cc 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fi.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fi.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=kehitys
 about=Apache fdb (Flash Player Debugger) [versio ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Soitin ei vastannut komentoon odotetulla tavalla. Komento keskeytettiin.
 notSuspendedException=Komentoa ei voi antaa, kun soitin on k\u00e4ynniss\u00e4
 illegalStateException=Komento ei kelpaa ilman istuntoa.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fr.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fr.properties
index 343ff4c..ddbe83d 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fr.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_fr.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=d\u00e9veloppement
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. Tous droits r\u00e9serv\u00e9s.
+copyright=Copyright 2017 The Apache Software Foundation. Tous droits r\u00e9serv\u00e9s.
 noResponseException=Le lecteur n'a pas r\u00e9pondu \u00e0 la commande comme pr\u00e9vu ; commande annul\u00e9e.
 notSuspendedException=Impossible d'\u00e9mettre la commande lorsque le lecteur est en cours d'ex\u00e9cution
 illegalStateException=Commande incorrecte sans session.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_it.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_it.properties
index 6ab6959..f724c53 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_it.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_it.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=sviluppo
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player non ha risposto al comando come previsto. Comando terminato.
 notSuspendedException=Impossibile inviare il comando mentre Player \u00e8 in esecuzione
 illegalStateException=Comando non valido senza una sessione.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ja.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ja.properties
index 17424d6..8852f48 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ja.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ja.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=development
 about=Apache fdb (Flash Player Debugger) [\u30d3\u30eb\u30c9 ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player \u304c\u30b3\u30de\u30f3\u30c9\u306b\u5bfe\u3057\u3066\u4e88\u671f\u3055\u308c\u305f\u5fdc\u7b54\u3092\u3057\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u51e6\u7406\u306f\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u3002
 notSuspendedException=Player \u306e\u5b9f\u884c\u4e2d\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
 illegalStateException=\u30bb\u30c3\u30b7\u30e7\u30f3\u304c\u78ba\u7acb\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u3001\u30b3\u30de\u30f3\u30c9\u306f\u7121\u52b9\u3067\u3059\u3002
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ko.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ko.properties
index f086cff..c271765 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ko.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ko.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=\uac1c\ubc1c
 about=Apache fdb(Flash Player Debugger) [\ube4c\ub4dc ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=\ud50c\ub808\uc774\uc5b4\uac00 \uc608\uc0c1\ub300\ub85c \uba85\ub839\uc5d0 \uc751\ub2f5\ud558\uc9c0 \uc54a\uc544 \uba85\ub839\uc774 \uc911\ub2e8\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 notSuspendedException=\ud50c\ub808\uc774\uc5b4 \uc2e4\ud589 \uc911\uc5d0 \uba85\ub839\uc744 \uc218\ud589\ud560 \uc218 \uc5c6\uc74c
 illegalStateException=\uc138\uc158\uc774 \uc5c6\uc73c\uba74 \uba85\ub839\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nb.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nb.properties
index 171a397..6e3d89a 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nb.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nb.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=utvikling
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Spilleren reagerte ikke som forventet p\u00e5 kommandoen. Kommando ble avbrutt.
 notSuspendedException=Kommandoen kan ikke gis mens spilleren kj\u00f8rer
 illegalStateException=Kommandoen er ikke gyldig uten en \u00f8kt.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nl.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nl.properties
index e02d295..1447a71 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nl.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_nl.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=ontwikkeling
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player heeft op onverwachte wijze gereageerd op de opdracht; opdracht afgebroken.
 notSuspendedException=Kan opdracht niet uitvoeren terwijl Player wordt uitgevoerd
 illegalStateException=Opdracht niet geldig zonder sessie
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_pt.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_pt.properties
index 12e33ed..d84aace 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_pt.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_pt.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=desenvolvimento
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. Todos os direitos reservados.
+copyright=Copyright 2017 The Apache Software Foundation. Todos os direitos reservados.
 noResponseException=O Player n\u00e3o respondeu ao comando como esperado; comando anulado.
 notSuspendedException=N\u00e3o \u00e9 poss\u00edvel emitir o comando enquanto o Player est\u00e1 em execu\u00e7\u00e3o
 illegalStateException=Comando inv\u00e1lido sem uma sess\u00e3o.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ru.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ru.properties
index cec27cc..9109214 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ru.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_ru.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u043a\u0430
 about=Apache fdb (\u043e\u0442\u043b\u0430\u0434\u0447\u0438\u043a Flash Player) [\u0441\u0431\u043e\u0440\u043a\u0430 ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043e\u0442\u0432\u0435\u0442\u0438\u043b \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0443 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c; \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u043f\u0440\u0435\u0440\u0432\u0430\u043d\u043e.
 notSuspendedException=\u041a\u043e\u043c\u0430\u043d\u0434\u0443 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f
 illegalStateException=\u041a\u043e\u043c\u0430\u043d\u0434\u0430 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0439 \u0431\u0435\u0437 \u0441\u0435\u0430\u043d\u0441\u0430.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_sv.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_sv.properties
index 7109382..215164a 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_sv.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_sv.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=utveckling
 about=Apache fdb (Flash Player Debugger) [build ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. Med ensamr\u00e4tt.
+copyright=Copyright 2017 The Apache Software Foundation. Med ensamr\u00e4tt.
 noResponseException=Spelaren svarade inte p\u00e5 kommandot som f\u00f6rv\u00e4ntat. Kommandot har avbrutits.
 notSuspendedException=Du kan inte ange kommandon n\u00e4r spelaren k\u00f6rs.
 illegalStateException=Kommandot \u00e4r inte giltigt utan session.
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_CN.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_CN.properties
index a15e848..e24c715 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_CN.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_CN.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=\u5f00\u53d1
 about=Apache fdb\uff08Flash Player \u8c03\u8bd5\u5668\uff09[\u5185\u90e8\u7248\u672c ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player \u672a\u6309\u9884\u671f\u65b9\u5f0f\u54cd\u5e94\u547d\u4ee4\uff1b\u547d\u4ee4\u5df2\u5f02\u5e38\u7ec8\u6b62\u3002
 notSuspendedException=Player \u5904\u4e8e\u8fd0\u884c\u72b6\u6001\u65f6\u65e0\u6cd5\u53d1\u51fa\u547d\u4ee4
 illegalStateException=\u5982\u679c\u6ca1\u6709\u4f1a\u8bdd\uff0c\u5219\u547d\u4ee4\u65e0\u6548\u3002
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_TW.properties b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_TW.properties
index eb89bdd..3e26372 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_TW.properties
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/fdb_zh_TW.properties
@@ -25,7 +25,7 @@
 
 defaultBuildName=\u958b\u767c
 about=Apache fdb (Flash Player \u9664\u932f\u7a0b\u5f0f) [\u7d44\u5efa ${build}]
-copyright=Copyright 2016 The Apache Software Foundation. All rights reserved.
+copyright=Copyright 2017 The Apache Software Foundation. All rights reserved.
 noResponseException=Player \u672a\u5982\u9810\u671f\u56de\u61c9\u6307\u4ee4\uff1b\u6307\u4ee4\u5df2\u4e2d\u6b62\u3002
 notSuspendedException=Player \u6b63\u5728\u57f7\u884c\u6642\u7121\u6cd5\u767c\u51fa\u6307\u4ee4
 illegalStateException=\u5982\u679c\u6c92\u6709\u5de5\u4f5c\u968e\u6bb5\uff0c\u6307\u4ee4\u5c31\u7121\u6548\u3002
diff --git a/modules/downloads.xml b/modules/downloads.xml
index a827ce5..c051657 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -78,8 +78,9 @@
     <property name="commons-discovery.name" value="commons-discovery-0.2"/>	
     <property name="commons-logging.name" value="commons-logging-1.0.4"/>
 	
-    <property name="saxon9.bin.zip" value="saxonb9-1-0-8j.zip"/>
-    <property name="saxon9.jar.dir" value="saxonb9-1-0-8j"/>
+    <property name="saxon9.jar" value="saxonb9-1-0-8.jar"/>
+    <property name="saxon9.download.url" value="http://repo1.maven.org/maven2/net/sourceforge/saxon/saxon/9.1.0.8/saxon-9.1.0.8.jar"/>
+    <property name="saxon9.notice.dir" value="${FLEX_HOME}/licenseParts/saxon9-NOTICES"/>
     
     <property name="xerces.dir" value="xerces-2_9_1"/>
      
@@ -448,29 +449,25 @@
     <target name="saxon9-jar" depends="saxon9-jar-check" unless="saxon9.jar.exists" 
         description="Copies sax9.jar to the lib directory.">
 
-        <get src="http://downloads.sourceforge.net/project/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip?r=&amp;ts=1366147457&amp;use_mirror=superb-dca2" 
-            dest="${download.dir}/${saxon9.bin.zip}" 
+        <get src="${saxon9.download.url}" 
+            dest="${download.dir}/saxon9.jar" 
             verbose="false" ignoreerrors="true"/>
 
         <antcall target="get-from-cache-if-needed" >
-            <param name="filename" value="${saxon9.bin.zip}" />
+            <param name="filename" value="saxon9.jar" />
             <param name="destDir" value="${download.dir}" />
         </antcall>
         <antcall target="fail-if-not-found" >
-            <param name="filename" value="${saxon9.bin.zip}" />
+            <param name="filename" value="saxon9.jar" />
             <param name="destDir" value="${download.dir}" />
         </antcall>
 
-    	<unzip src="${download.dir}/${saxon9.bin.zip}"
-    		dest="${download.dir}/${saxon9.jar.dir}"/>
-        
-        <copy file="${download.dir}/${saxon9.jar.dir}/saxon9.jar" toDir="${lib.ext.dir}" verbose="true"/>
-        
-        <copy todir="${lib.ext.dir}/saxon9-NOTICES">
-            <fileset dir="${download.dir}/${saxon9.jar.dir}/notices" includes="**"/>
+        <copy toDir="${lib.ext.dir}/saxon9-NOTICES" verbose="true">
+            <fileset dir="${saxon9.notice.dir}" includes="**"/>
         </copy>
+        <copy file="${download.dir}/saxon9.jar" toDir="${lib.ext.dir}" verbose="true"/>
         
-        <delete dir="${download.dir}/${saxon9.jar.dir}"/>
+        <delete dir="${download.dir}/saxon9.jar"/>
     </target>
     	
     <!--
diff --git a/modules/swfutils/src/java/flash/swf/TagDecoder.java b/modules/swfutils/src/java/flash/swf/TagDecoder.java
index 45b7326..526780b 100644
--- a/modules/swfutils/src/java/flash/swf/TagDecoder.java
+++ b/modules/swfutils/src/java/flash/swf/TagDecoder.java
@@ -2788,15 +2788,20 @@
     {
         FileAttributes tag = new FileAttributes();
         r.syncBits();
+        
         r.readUBits(1); //reserved
         tag.useDirectBlit = r.readBit();
         tag.useGPU = r.readBit();
         tag.hasMetadata = r.readBit();
+        
         tag.actionScript3 = r.readBit();
         tag.suppressCrossDomainCaching = r.readBit();
         tag.swfRelativeUrls = r.readBit();
         tag.useNetwork = r.readBit();
-        r.readUBits(24); //reserved
+        
+        tag.brokerProductManager = r.readBit();
+        tag.brokerLocalConnection = r.readBit();
+        r.readUBits(22); //reserved
         return tag;
     }
     
diff --git a/modules/swfutils/src/java/flash/swf/TagEncoder.java b/modules/swfutils/src/java/flash/swf/TagEncoder.java
index 4652ed1..a723875 100644
--- a/modules/swfutils/src/java/flash/swf/TagEncoder.java
+++ b/modules/swfutils/src/java/flash/swf/TagEncoder.java
@@ -114,7 +114,9 @@
         tagw.writeBit(tag.suppressCrossDomainCaching);
         tagw.writeBit(tag.swfRelativeUrls);
         tagw.writeBit(tag.useNetwork);
-        tagw.writeUBits(0, 24);
+        tagw.writeBit(tag.brokerProductManager);
+        tagw.writeBit(tag.brokerLocalConnection);
+        tagw.writeUBits(0, 22);
         encodeTag(tag);
     }
     
diff --git a/modules/swfutils/src/java/flash/swf/tags/FileAttributes.java b/modules/swfutils/src/java/flash/swf/tags/FileAttributes.java
index 2f4b27f..5a43e8f 100644
--- a/modules/swfutils/src/java/flash/swf/tags/FileAttributes.java
+++ b/modules/swfutils/src/java/flash/swf/tags/FileAttributes.java
@@ -45,6 +45,8 @@
     public boolean useNetwork;
     public boolean useGPU;
     public boolean useDirectBlit;
+    public boolean brokerProductManager;
+    public boolean brokerLocalConnection;
 
     public FileAttributes()
     {
@@ -70,6 +72,8 @@
                 (tag.swfRelativeUrls == this.swfRelativeUrls) &&
                 (tag.useDirectBlit == this.useDirectBlit) &&
                 (tag.useGPU == this.useGPU) &&
+                (tag.brokerProductManager == this.brokerProductManager) &&
+                (tag.brokerLocalConnection == this.brokerLocalConnection) &&
                 (tag.useNetwork == this.useNetwork))
             {
                 isEqual = true;
diff --git a/modules/swfutils/src/java/flash/swf/tools/SwfxParser.java b/modules/swfutils/src/java/flash/swf/tools/SwfxParser.java
index 474d7bc..217b53d 100644
--- a/modules/swfutils/src/java/flash/swf/tools/SwfxParser.java
+++ b/modules/swfutils/src/java/flash/swf/tools/SwfxParser.java
@@ -497,6 +497,8 @@
         tag.suppressCrossDomainCaching = parseBoolean(getAttribute(attributes, "suppressCrossDomainCaching"));
         tag.swfRelativeUrls = parseBoolean(getAttribute(attributes, "swfRelativeUrls"));
         tag.useNetwork = parseBoolean(getAttribute(attributes, "useNetwork"));
+        tag.brokerProductManager = parseBoolean(getAttribute(attributes, "brokerProductManager"));
+        tag.brokerLocalConnection = parseBoolean(getAttribute(attributes, "brokerLocalConnection"));
         stack.push(tag);
     }
     
diff --git a/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java b/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
index 87bd084..5f1a13d 100644
--- a/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
+++ b/modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
@@ -228,6 +228,8 @@
 			out.print(" suppressCrossDomainCaching='" + tag.suppressCrossDomainCaching + "'");
 			out.print(" swfRelativeUrls='" + tag.swfRelativeUrls + "'");
 			out.print(" useNetwork='" + tag.useNetwork + "'");
+            out.print(" brokerProductManager='" + tag.brokerProductManager + "'");
+            out.print(" brokerLocalConnection='" + tag.brokerLocalConnection + "'");
 			close();
 		}
 		
diff --git a/modules/thirdparty/velocity/test/texen/additional.props b/modules/thirdparty/velocity/test/texen/additional.props
deleted file mode 100644
index db25562..0000000
--- a/modules/thirdparty/velocity/test/texen/additional.props
+++ /dev/null
@@ -1 +0,0 @@
-occupation=somnambulist
diff --git a/modules/thirdparty/velocity/test/texen/compare/Test.txt b/modules/thirdparty/velocity/test/texen/compare/Test.txt
deleted file mode 100644
index f2bb18d..0000000
--- a/modules/thirdparty/velocity/test/texen/compare/Test.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# These should all evaluate to true
-
-true
-true
-true
-
-# These should all evaluate to false
-
-false
-false
-false
diff --git a/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java b/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java
deleted file mode 100644
index db2bd31..0000000
--- a/modules/thirdparty/velocity/test/texen/compare/TurbineWeather.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.apache.turbine.services.weather;
-
-/*
- * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- *    "Java Apache Project" must not be used to endorse or promote products
- *    derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- *    nor may "Apache" nor "Apache JServ" appear in their names without
- *    prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
- */
-
-
-import org.apache.turbine.services.TurbineServices;
-
-/**
- *
- *
- * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @occupation somnambulist
- */
-public class TurbineWeather
-{
-    /**
-     * Utility method for accessing the service 
-     * implementation
-     *
-     * @return a WeatherService implementation instance
-     */
-    protected static WeatherService getService()
-    {
-        return (WeatherService)TurbineServices
-            .getInstance().getService(WeatherService.SERVICE_NAME);
-    }
-}
diff --git a/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java b/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java
deleted file mode 100644
index 1cc8d7a..0000000
--- a/modules/thirdparty/velocity/test/texen/compare/TurbineWeatherService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.apache.turbine.services.weather;
-
-/*
- * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- *    "Java Apache Project" must not be used to endorse or promote products
- *    derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- *    nor may "Apache" nor "Apache JServ" appear in their names without
- *    prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
- */
-
-
-import org.apache.turbine.services.TurbineBaseService;
-
-/**
- *
- * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @occupation somnambulist
- */
-public class TurbineWeatherService extends TurbineBaseService
-    implements WeatherService
-
-{
-    /**
-     * Initialize the TurbineWeather Service.
-     */
-    public void init()
-    {
-        setInit(true);
-    }
-}
diff --git a/modules/thirdparty/velocity/test/texen/compare/WeatherService.java b/modules/thirdparty/velocity/test/texen/compare/WeatherService.java
deleted file mode 100644
index 9373f44..0000000
--- a/modules/thirdparty/velocity/test/texen/compare/WeatherService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.apache.turbine.services.weather;
-
-/*
- * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- *    "Java Apache Project" must not be used to endorse or promote products
- *    derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- *    nor may "Apache" nor "Apache JServ" appear in their names without
- *    prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
- */
-
-
-import org.apache.turbine.services.Service;
-
-/**
- *
- * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @occupation somnambulist
- */
-public interface WeatherService extends Service
-{
-    public static final String SERVICE_NAME = "TurbineWeatherService";
-}
diff --git a/modules/thirdparty/velocity/test/texen/compare/book.txt b/modules/thirdparty/velocity/test/texen/compare/book.txt
deleted file mode 100644
index 9c55b7a..0000000
--- a/modules/thirdparty/velocity/test/texen/compare/book.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-This is the book of the week:
-
-Props retrieved using new method:
-
-Title: Consilience: The Unity of Knowledge
-Author: Edward O. Wilson
-Publisher: Knopf
-ISBN: 0965058305
-
-Props retrieved using old method:
-
-Title: Consilience: The Unity of Knowledge
-Author: Edward O. Wilson
-Publisher: Knopf
-ISBN: 0965058305
diff --git a/modules/thirdparty/velocity/test/texen/license.txt b/modules/thirdparty/velocity/test/texen/license.txt
deleted file mode 100644
index a5c1c2c..0000000
--- a/modules/thirdparty/velocity/test/texen/license.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1997-2000 The Java Apache Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
- *    "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
- *    "Java Apache Project" must not be used to endorse or promote products
- *    derived from this software without prior written permission.
- *
- * 5. Products derived from this software may not be called "Apache JServ"
- *    nor may "Apache" nor "Apache JServ" appear in their names without
- *    prior written permission of the Java Apache Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the Java Apache
- *    Project for use in the Apache JServ servlet engine project
- *    <http://java.apache.org/>."
- *
- * THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Java Apache Group. For more information
- * on the Java Apache Project and the Apache JServ Servlet Engine project,
- * please see <http://java.apache.org/>.
- *
- */
diff --git a/modules/thirdparty/velocity/test/texen/service.props b/modules/thirdparty/velocity/test/texen/service.props
deleted file mode 100644
index fe7dff2..0000000
--- a/modules/thirdparty/velocity/test/texen/service.props
+++ /dev/null
@@ -1,21 +0,0 @@
-baseName=Weather
-package=org.apache.turbine.services.weather
-name=Jason van Zyl
-email=jvanzyl@apache.org
-
-## The contents of the file license.txt
-## will be available in the context
-## as $license.
-
-license.file.contents = ../test/texen/license.txt
-
-# Test some properties that have be give some boolean
-# values.
-
-one = true
-two = yes
-three = on
-
-four = false
-five = no
-six = off
diff --git a/modules/thirdparty/velocity/test/texen/templates/Control.vm b/modules/thirdparty/velocity/test/texen/templates/Control.vm
deleted file mode 100644
index 3a8a4ee..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/Control.vm
+++ /dev/null
@@ -1,41 +0,0 @@
-#set ( $sourceFile = "Turbine${baseName}Service.java" )
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-$generator.parse("ServiceImplementation.vm",$sourceFile)
-
-#set ( $sourceFile = "${baseName}Service.java" )
-$generator.parse("ServiceInterface.vm",$sourceFile)
-
-#set ( $sourceFile = "Turbine${baseName}.java" )
-$generator.parse("ServiceStaticHelper.vm",$sourceFile)
-
-#set ( $sourceFile = "Test.txt" )
-$generator.parse("Test.vm",$sourceFile)
-
-#set ( $props = $properties.load("test.props") )
-
-## This is to test a properties file that was once taken from
-## the file system but is now taken from a JAR. We have to
-## deprecate the use of $generator.TemplatePath if we want
-## templates to work the same way from JARs and the file
-## system. I have a hack in PropsUtil right now to deal
-## with it.
-
-#set ( $props2 = $properties.load("$generator.TemplatePath/test.props") )
-$generator.TemplatePath/test.props
-#set ( $sourceFile = "book.txt" )
-$generator.parse("book.vm",$sourceFile)
diff --git a/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm b/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm
deleted file mode 100644
index fa2c9e0..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/ServiceImplementation.vm
+++ /dev/null
@@ -1,39 +0,0 @@
-package $package;
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-$license
-
-import org.apache.turbine.services.TurbineBaseService;
-
-/**
- *
- * @author <a href="mailto:$email">$name</a>
- * @occupation $occupation
- */
-public class Turbine${baseName}Service extends TurbineBaseService
-    implements ${baseName}Service
-
-{
-    /**
-     * Initialize the Turbine${baseName} Service.
-     */
-    public void init()
-    {
-        setInit(true);
-    }
-}
diff --git a/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm b/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm
deleted file mode 100644
index 5d21e8a..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/ServiceInterface.vm
+++ /dev/null
@@ -1,31 +0,0 @@
-package $package;
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-$license
-
-import org.apache.turbine.services.Service;
-
-/**
- *
- * @author <a href="mailto:$email">$name</a>
- * @occupation $occupation
- */
-public interface ${baseName}Service extends Service
-{
-    public static final String SERVICE_NAME = "Turbine${baseName}Service";
-}
diff --git a/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm b/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm
deleted file mode 100644
index 81ad3c7..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/ServiceStaticHelper.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-package $package;
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-$license
-
-import org.apache.turbine.services.TurbineServices;
-
-/**
- *
- *
- * @author <a href="mailto:$email">$name</a>
- * @occupation $occupation
- */
-public class Turbine$baseName
-{
-    /**
-     * Utility method for accessing the service 
-     * implementation
-     *
-     * @return a ${baseName}Service implementation instance
-     */
-    protected static ${baseName}Service getService()
-    {
-        return (${baseName}Service)TurbineServices
-            .getInstance().getService(${baseName}Service.SERVICE_NAME);
-    }
-}
diff --git a/modules/thirdparty/velocity/test/texen/templates/Test.vm b/modules/thirdparty/velocity/test/texen/templates/Test.vm
deleted file mode 100644
index 51aa610..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/Test.vm
+++ /dev/null
@@ -1,27 +0,0 @@
-# These should all evaluate to true
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-$one
-$two
-$three
-
-# These should all evaluate to false
-
-$four
-$five
-$six
diff --git a/modules/thirdparty/velocity/test/texen/templates/book.vm b/modules/thirdparty/velocity/test/texen/templates/book.vm
deleted file mode 100644
index c64f4df..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/book.vm
+++ /dev/null
@@ -1,31 +0,0 @@
-This is the book of the week:
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-Props retrieved using new method:
-
-Title: $props.get("title")
-Author: $props.get("author")
-Publisher: $props.get("publisher")
-ISBN: $props.get("isbn")
-
-Props retrieved using old method:
-
-Title: $props2.get("title")
-Author: $props2.get("author")
-Publisher: $props2.get("publisher")
-ISBN: $props2.get("isbn")
diff --git a/modules/thirdparty/velocity/test/texen/templates/test.props b/modules/thirdparty/velocity/test/texen/templates/test.props
deleted file mode 100644
index 7803869..0000000
--- a/modules/thirdparty/velocity/test/texen/templates/test.props
+++ /dev/null
@@ -1,4 +0,0 @@
-author = Edward O. Wilson
-title = Consilience: The Unity of Knowledge
-publisher = Knopf
-isbn = 0965058305
diff --git a/templates/swfobject/history/history.js b/templates/swfobject/history/history.js
index 4db119c..e0c3183 100644
--- a/templates/swfobject/history/history.js
+++ b/templates/swfobject/history/history.js
@@ -262,27 +262,8 @@
             }
 
             if (browser.safari && !browserHasHashChange) {
-                // for Safari, submit a form whose action points to the desired URL
-                if (browser.version <= 419.3) {
-                    var file = window.location.pathname.toString();
-                    file = file.substring(file.lastIndexOf("/")+1);
-                    getFormElement().innerHTML = '<form name="historyForm" action="'+file+'#' + flexAppUrl + '" method="GET"></form>';
-                    //get the current elements and add them to the form
-                    var qs = window.location.search.substring(1);
-                    var qs_arr = qs.split("&");
-                    for (var i = 0; i < qs_arr.length; i++) {
-                        var tmp = qs_arr[i].split("=");
-                        var elem = document.createElement("input");
-                        elem.type = "hidden";
-                        elem.name = tmp[0];
-                        elem.value = tmp[1];
-                        document.forms.historyForm.appendChild(elem);
-                    }
-                    document.forms.historyForm.submit();
-                } else {
-                    top.location.hash = flexAppUrl;
-                }
-                // We also have to maintain the history by hand for Safari
+                top.location.hash = flexAppUrl;
+                // We have to maintain the history by hand for Safari
                 historyHash[history.length] = flexAppUrl;
                 _storeStates();
             } else {