License Change

Merged Sid Sijbrandij requested to merge license-change into master