Merge branch 'hotfix/1.0.36' v1.0.36
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Oct 2016 16:57:26 +0000 (12:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Oct 2016 16:57:26 +0000 (12:57 -0400)
commita37f37e1019dc257efe6dc93315874c3f9a4d7e8
treee72a891e07873c431b929ba3c4f353c3b0665cf2
parent1f5d726467e94895ce7ec6c4b502e722eb3ee4dc
parent8dc433202784f4787f4317a1bad8bbc71bbeb7ad
Merge branch 'hotfix/1.0.36'