[SVN r34785]
[SVN r29100]
[SVN r27053]
Changed Dr John Maddock to John Maddock [SVN r26793]
[SVN r26692]