THISTED-2 - Fix default image bug.
Merge branch 'THISTED-2' into develop