Reference In Terms

Merged Sid Sijbrandij requested to merge reference-in-terms into master