Fix offline app.
Merge branch 'master' into stable