Merge branch 'michael'

Conflicts:
doc