Merge branch 'hotfix/1.3.9' v1.3.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Sep 2016 13:47:09 +0000 (09:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Sep 2016 13:47:09 +0000 (09:47 -0400)

Trivial merge