Autoplay refactor #8848

bbondy merged 1 commit into master from autoplay_refactor May 15, 2017