Merge docs, closes #783