Merge branch 'hotfix/1.0.37' v1.0.37
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:24:28 +0000 (11:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:24:28 +0000 (11:24 -0500)
commitb90f8a75ea64cea463271b03cfe37a5324344f05
tree2f8df574033e485cd26672529d217c274af36199
parent69d9661c10803243dd38815ac984ead2f61d0585
parent978707f3a210acc74c70bc094c0d7705e30cb99f
Merge branch 'hotfix/1.0.37'