Merge branch 'hotfix/1.0.34' v1.0.34
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)
commitf66c34dc81133625940d65a68a5d316bfc475443
tree6d5f914613985806a16c3a4edfdbb87b0386ecfd
parentf81c74f5e4a3a5398e84f438f0a696fd7c00f93a
parentc4d8b3e47f4246f7e97ffeca3d736955576f4289
Merge branch 'hotfix/1.0.34'