[SVN r83498]
[SVN r50499]
[SVN r31493]
Changed Dr John Maddock to John Maddock [SVN r26793]
[SVN r26692]