Merge branch '9303-kill-nodemanager-on-dead-actor' refs #9303
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 25 May 2016 20:30:10 +0000 (16:30 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 25 May 2016 20:30:23 +0000 (16:30 -0400)

Trivial merge