Pulling in changes to fix gs and glossy with full attribute support.