sbt/sbt — pull request #1343 by jsuereth (2014-05-16 17:56:13+00:00)
Title: Wip/0.13.5 merge

Review by @eed3si9n

Just merged changes in 0.13.5 branch to 0.13