Merge branch 'hotfix/1.0.22' v1.0.22
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:02:44 +0000 (16:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 24 Oct 2016 20:02:44 +0000 (16:02 -0400)
commitb0a990742a50b947003ff6f70066a0a32372d1f7
tree5c5fe83374c97ca0e6ef5d832d9ec44454c387f8
parent4f1b93327a7f0c86fcddfce029ba3679052fbf17
parent92d28e15de8cf957c1909f7a1c8a7febbef2af56
Merge branch 'hotfix/1.0.22'