[django 1.4] fix SlashNewlineStrippingTemplateLoader
Merge branch 'master' into events2