io 2013.12.04/fix HEAD

Closes #24940.
Closes #24822.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>