rollup merge of #18438 : jakub-/empty-file

This commit is contained in:
Alex Crichton 2014-10-30 08:57:59 -07:00
commit 8c03068b7a