user avatar
Merge fixes
Jens Bache-Wiig authored
88de12ef