Merge branch 'hotfix/1.4.2' v1.4.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 18:42:53 +0000 (14:42 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 18:42:53 +0000 (14:42 -0400)
commitd8e2646f618c47fa241d25401ddf79e6a2876f0f
treee779cf1c5d655adea50edbeb9766942c3fda8c57
parentbd61c445919bb8ace7c894536a8071814c040921
parentf83254ed062b95272b6e530160250c829f2b5248
Merge branch 'hotfix/1.4.2'