Merge branch '2.0'

This commit is contained in:
terrafrost 2017-07-16 12:10:37 -05:00
commit 2b80803042