Fixes image update
Merge branch 'master' of git.neuf.no:oliver_screen