Terms Update

Merged Sid Sijbrandij requested to merge terms-update into master