support timeout for upstream
Merge branch 'development'

Conflicts:
	resizer.go