A commit by me.
Merge remote-tracking branch 'origin/JWALLACE' into dredmond