akka/akka — pull request #899 by patriknw (2012-11-26 13:20:37+00:00)
Title: Cherry-pick of #2739 to release-2.1

(cherry picked from commit 486278726b2f3399139118d10110877f29b2f8ae)