Merge "Document how to use GPL components from 3.0 and 3.1"