f6e4694d67
This should be cmr'd to v1.5 and v1.4.2 (but the svn post hook won't let me at the moment). This commit was SVN r22827.