Rename back
Merge branch 'master' into ospalh-special
Merge remote-tracking branch 'origin/master'
Rename files to that used in the collection.
It's un again. For now...
Seems to work.
Merge branch 'master' into ospalh-special
Merge remote-tracking branch 'origin/ospalh-special' into ospalh-special