[CON-71] fix bug as described in the issue
Merge branch 'develop' of github.com:knd/concourse into develop