Merge branch '2.5.x' into 2.x

_build/build.sample.properties

@@ -11,7 +11,7 @@ git.command = git
 #project.name.fs = modx
 
 # Override to set the version and release strings
-#modx.core.version = 2.5.0
+#modx.core.version = 2.5.1
 #modx.core.release = pl
 
 # these properties require a local Git clone in order to produce distributions
@@ -25,7 +25,7 @@ git.command = git
 #build.nominify = true
 
 # Override to pull source from a specific ref in the git repository
-#build.src.tree = v2.5.0-pl
+#build.src.tree = v2.5.1-pl
 
 # Override to turn off the additional of timestamps to the distribution packages (used for nightlies)
 #build.timestamp = false

_build/build.xml

@@ -19,7 +19,7 @@
     <property name="project.manager.dir" value="${project.root.dir}/manager" />
 
     <!-- Set the project version -->
-    <property name="modx.core.version" value="2.5.0" />
+    <property name="modx.core.version" value="2.5.1" />
     <property name="modx.core.release" value="pl" />
 
     <!-- Set some common build properties -->

core/docs/changelog.txt

@@ -2,6 +2,8 @@
 This file shows the changes in recent releases of MODX. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+MODX Revolution 2.5.1-pl (July 21, 2016)
+====================================
 - Preserve original behavior for 3PC RTE TVs [#13071]
 - Fix with of install button after text change [#13078]
 - Fix server port check in setup start script [#13037]

core/docs/version.inc.php

@@ -2,7 +2,7 @@
 $v= array ();
 $v['version']= '2'; // Current version.
 $v['major_version']= '5'; // Current major version.
-$v['minor_version']= '0'; // Current minor version.
+$v['minor_version']= '1'; // Current minor version.
 $v['patch_level']= 'pl'; // Current patch level.
 $v['code_name']= 'Revolution'; // Current codename.
 $v['distro']= '@git@';