adding Norm's latest change
Merge branch 'master' of https://github.com/noahgift/boundary