Merge pull request #926 from GeneFerneau/core