Merge "Update License text"