fix link to CC license
Merge branch 'master' into golden_master