Merge pull request #1838 from esdrubal/assemblyname