Merge branch 'hotfix/1.0.38' v1.0.38
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:26:06 +0000 (11:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 16:26:06 +0000 (11:26 -0500)
commit867a1036252316a116a40257ee535503f14fb63e
treecc79a6d749ff66958c20783b4fd0a19c9e66ee60
parentb90f8a75ea64cea463271b03cfe37a5324344f05
parentd4c3f760819d0aefeaf40174348d2b9a8dced0f2
Merge branch 'hotfix/1.0.38'