merge heads (stable)
non-blocking application version retrieval
this can fail - if the app is unknown - but so could the previous version
merge bug25571 into stable
merge stable into default