Merges changes in r214 from branches/release-1.3 to tags/release-1.3.0: svn merge -r 214:215 branches/release-1.3 tags/release-1.3.0