Merged FileBackend branch. Manually avoiding merging the many prop-only changes SVN...