Conditionally check for updates
3.1 stable
merge