Merge branch 'release/1.0.39' v1.0.39
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:42:04 +0000 (14:42 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 27 Oct 2015 18:42:04 +0000 (14:42 -0400)

Trivial merge