Update port to current stable release
State Changed From-To: open->closed committed (with minor modification), thanks