Merged SVN r516.