Fix #12810
Merge pull request #15550 from thatch45/2014.7

Fix #12810