sync with Heroku
Signed-off-by: Larry Mason <lmason@HungryProgrammer.com>