Merge branch 'hotfix/1.1.21' v1.1.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 17:51:48 +0000 (13:51 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 Aug 2016 17:51:48 +0000 (13:51 -0400)
commit014d783bbd33a4964fd4aee20319c74b9051e026
treedebfc0483029a2685b78bbf077102cbc5254c55b
parenta7c0ae6fb8223cc41df94325dc02d7f65acf9e40
parent4d1634e8c38240b168d7f6c748ee418a2caeee5d
Merge branch 'hotfix/1.1.21'