Merge branch 'hotfix/1.0.6' 1.0.6
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 15:30:00 +0000 (11:30 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 15:30:00 +0000 (11:30 -0400)
commit855308f526b125751be4075e4027b9420469d278
tree38046452f1ced811bd4ca6a1330a11fa0eca1284
parentb41b9b8e543711fcdd216097ce6d9d5cc7e3f517
parentcd795aba971bd4e5117cac41ba6e281649e20aa0
Merge branch 'hotfix/1.0.6'