update hamster to latest from master: bfa1f21204