Fix for bug 372276
Reviewed by Blaise Doughan
13 files changed