be more specific when checking if option values are empty
the DOCUMENT_ROOT env var is not reliable on many web hosts, stop using it entirely
Merge branch 'master' into buddypress