Merging changes from asl-usgs master