Merge branch 'release/1.2.39' v1.2.39
authorIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 14:41:12 +0000 (09:41 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 10 Nov 2017 14:41:12 +0000 (09:41 -0500)

Trivial merge