N/A
Merge commit '40946ae2fbe8a940c91ae2f1afb32c3a16e499d0'

Conflicts:
	references/platform/Caching.cs