updated to 4.6.1 from upstream