Fixes PR13406
20130104