Merge tag 'v1.2.40' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 18:42:44 +0000 (13:42 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 18:42:44 +0000 (13:42 -0500)
commitb38ac3de4ee99eed9e960490e919ca564a34115f
tree8b8492dc95641fb482f1c3450a92241936ec7c0b
parentf198d1cd2349117ca8d1979f4aba73f8baf5c3ba
parent4003c053e848b5544e8681acfd2de4bc15f94e1f
Merge tag 'v1.2.40' into develop

version 1.2.40