Merge branch 'hotfix/1.0.26' 1.0.26
authorIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:35:22 +0000 (15:35 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 10 Aug 2016 19:35:22 +0000 (15:35 -0400)
commitce9f6384362c42717ba77fd693ca1fe745b754e0
treef2e9b72d3b017495669fc2ea31540d03b59e9563
parent4f9e1a92af7c7454983d824a94ed887523534f01
parentb9f1d36d83b358a260d5c55b9dcf68625fe9fa4e
Merge branch 'hotfix/1.0.26'