Merge branch '2.0'

This commit is contained in:
terrafrost 2016-11-18 20:37:26 -06:00
commit d6bf2b4f73