Variable '$messages' was overwritten.
For Pi 2.4.0 release
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	lib/Pi/Version/Version.php
Merge https://github.com/taiwen/pi into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #1042 from taiwen/develop

Variable '$messages' was overwritten.