merged master to branch

license should be now up to date on branch.