Revision 1879799

Merge the r1878909 group from trunk:

 * r1878909, r1878918, r1878950
   Fix a number of thinkos in human-readable file size formatting.
   Justification:
     Fixes wrong output and an assertion failure in debug mode.
   Votes:
     +1: brane, rhuijben, jamessan