added migradoc stuff
Merge commit 'e12f8419f60c9d7bbc29a14c2b9d8bcb84640384'