Updated to latest upstream, 3.5.1