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)

Trivial merge