sbt/sbt — pull request #1635 by jsuereth (2014-10-01 12:19:57+00:00)
Title: Wip/fix 1632

Fixes #16322

cc @topping no worries about the regression. It was a one line fix.

Review by @eed3si9n