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)
version 1.2.40


Trivial merge