another patched file and close fix
Updated a few web references
Merge remote-tracking branch 'upstream/master'