Merge remote-tracking branch 'origin/2.3-gae' into 2.3
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index efa0976..af779d7 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -61,7 +61,7 @@
# This exists as oss.sonatype only allows SNAPSHOT and final releases,
# so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT there.
# For final releases it's the same as "version".
-mavenVersion=2.3.24-SNAPSHOT
+mavenVersion=2.3.24-rc01-incubating
# Version string that conforms to OSGi
# ------------------------------------
