Merge branch 'release-1.5'
Merge branch 'dev' of github.com:berkmancenter/tagteam into dev