Merge pull request #2926 from devin-donnelly/release-1.6

Merge latest from Master into Release 1.6
This commit is contained in:
devin-donnelly
2017-03-20 13:57:54 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions