Merge branch 'release/1.1.5' into develop
Add read timeout to router metadata request
Merge branch 'release/1.1.6'

Conflicts:
	metadata.rb