Ignore UserDefinedForms from cache
Merge branch '3.1'