Merge branch '1.9'

Authored by davidedmundson on Jun 22 2017, 1:01 PM.