Merge pull request #1909 from esdrubal/reflection