[generic] Improve detection

Allow download of http://goo.gl/7X5tOk
Fixes #1818