Fix ISE (PY-10880).
Fix localhost problem on Mac OSX Lion (see Serge's comment in PY-7070).
Merge remote-tracking branch 'origin/master'