fixed djfurie's faulty merge --theirs
updated version text