Merging class exception files from asl-usgs master