Restored proper whitespace
Disabled AntiCacheManager debug statements
Merge remote-tracking branch 'upstream/master'