Merge with typhoeus/master