sbt/sbt — pull request #1344 by jsuereth (2014-05-16 18:05:43+00:00)
Title: Wip/merge 0.13.5

Bring latest fixes from 0.13.5 forward.