Merge: rev773 (handle numeric ip addresses when running tests)