Compatibility with .15 leftover
Merge pull request #925 from Digenis/master

a leftover for.15 compatibility