Release 5 3

Merging in the license change from SVN. Please take a careful look to make sure this is what we want. 
D'oh, looks like this reverted the ivy changes.