Merge pull request #8694 from neheb/inl