SPFolder issues
Merge branch 'Pau'