Removed DeferredResult from master until we determine which branch will succeed
Merge branch 'master' into nonpreferred

Conflicts:
	src/main/java/com/typesafe/scalacompat/concurrent/DeferredResult.java
Re-adding