Release mergeback#210

Merged

tphoney merged 2 commits intomasterfrom

May 9, 2017

Commits on May 8, 2017

1.2.0 Release Prep
Helen Campbell
committed
Merge pull request #209 from HelenCampbell/rprep
tphoney
authored