Merge branch 'release/1.2.40' v1.2.40
authorIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 18:42:24 +0000 (13:42 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 18:42:24 +0000 (13:42 -0500)
commit4003c053e848b5544e8681acfd2de4bc15f94e1f
tree8b8492dc95641fb482f1c3450a92241936ec7c0b
parentfdfa2afd5b6c25f096d20698466835d2e90d83bc
parentb8a883c873efeb26bdeb5ad253f889f48eb837fe
Merge branch 'release/1.2.40'