Fixes #107
Merge branch 'master' into t105_books_media_view