Changed to better handle localhost address, better performance since it gets it once on startup and avoid repeated errors when it can't get the localhost address, better defaults for where it is used
Commented section-iterate paginate attributes, they are not yet supported and may not be for a while, not sure how useful they are
Merge remote-tracking branch 'upstream/master'