Manual merge of #55 (autoplay fix)