Merge pull request #52 from Edugate/develop

add protection for (on the fly) metadata generated files
Merge branch 'develop' into 1.x-stable
Merge branch 'develop' into 1.x-stable