Several fixes to offline build
Merge branch 'master' of github.com:suttacentral/suttacentral