Merge pull request #1450 from stevepiercy/1.5-branch

Change autoclass to autoexception - cherry pick from master