Merge branch 'master' of https://github.com/srophe/manuscripts

Conflicts:
MS. Add. 12172.xml