Merge branch 'icebearPatch' into 1.1
Increased data caching
Merge branch '1.1' into icebearPatch