Merge branch 'master' of github.com:choreos/choreos_middleware
Merge branch 'master' of github.com:choreos/choreos_middleware