Merge in 'urlcrazy'.
Merge in 'wifitap'.