merged in fix for includes vs. requires
1 file changed