Merge branch 'master' into netcore2.0

This commit is contained in:
Steve Smith
2017-09-22 11:28:33 -04:00
committed by GitHub