Original pull request: #88. (cherry picked from commit 29f8e47fc22988435020e5e02a61409237106a65) Signed-off-by: John Blum <jblum@pivotal.io>
Original pull request: #88. (cherry picked from commit 29f8e47fc22988435020e5e02a61409237106a65) Signed-off-by: John Blum <jblum@pivotal.io>