Emergency fix for exception. (behaviour isn't perfect)
Merge branch 'master' of github.com:suttacentral/suttacentral