kgardas authored Feb 17, 2014 and thoughtpolice committed Feb 20, 2014

Signed-off-by: Austin Seipp <austin@well-typed.com>

(cherry picked from commit 5c6ced55)