Merge in changes that I pushed to the community site in 5.3.4 that fixed nginx/apache setups