BUGFIX: Size and status no longer show as 'unknown'
Merge branch 'herja' into abyssinian-nightjar
Merge branch 'abyssinian-nightjar'