Merge branch 'vso-9026075a'

This commit is contained in:
Greg Lindsay
2016-10-07 13:43:38 -07:00