Updated with fix for #3136.
1 file changed