9d170c3
Merge branch 'master' into comm Conflicts: en-US/Getting_More_Information.xml en-US/Packaging_Software_Collections.xml en-US/Revision_History.xml en-US/Software_Collections_Guide.xml