updates to pull in latest upstream release