Merge branch 'master' into search

Includes Willums home page link changes. Only file not merged is a
minified .css file that was safely regenerated instead.