backport of 2529907e55 to 0.4.5
Merge branch 'chango-0.4.5' of github.com:chango/disco into chango-0.4.5
merge