Merge branch '2.0'

This commit is contained in:
terrafrost 2016-11-18 20:48:18 -06:00
commit d1fa327ef9