Merged in rhaas/license (pull request #144)
No actual change in licensing, since Cactus before used GPL with a manual exception for linking.
No actual change in licensing, since Cactus before used GPL with a manual exception for linking.