Placeholder bugfix for FF18
Merge branch 'master' of github.com:libris/kitin