akka/akka — pull request #1130 by patriknw (2013-02-13 16:17:36+00:00)
Title: Backport of ticket #3030 and #3031

Should match PR #1122