BUGFIX: Swapped size and status values
Merge branch 'herja' into abyssinian-nightjar
Merge branch 'abyssinian-nightjar'