Merge branch 'simpledo' into qa

This commit is contained in:
Barbara Miller 2017-01-06 16:34:56 -08:00
commit 281bd538bf