failure robustness
player fault tolerance
Merge branch 'master' into HEAD