Would be nice to avoid us having to interrupt the playtest with auto updates, while still allowing us to merge stuff.