Merge pull request #1 from 30x/oss

G OSS policy prep2