Reflect various merges for 2.8.4.

SVN-Revision: 2519
1 file changed