Cache this too sucka
Merge branch '3.0/develop' of git://github.com/pyrocms/pyrocms into 3.0/develop

Conflicts:
	system/cms/modules/streams_core/models/fields_m.php