Check constant availability rather than guess based on OS version
Merge branch 'v2.x-beta' into nil-url-display-name
Display host name for title-less URLs
Assume they refer to the home directory