Merge branch 'release/1.1.4' into develop
Update code and version to fix testing for empty router list
Merge branch 'release/1.1.5'

Conflicts:
	metadata.rb