Back-port merge_vars doc fix to v0.4