fix #12540
Merge pull request #12543 from twbs/fix-12540

Fixes #12540