Fix to a typo causing exports to fail
Merge branch 'hotfix-2.1.15'