Merge branch 'hotfix/1.2.37' v1.2.37
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:21:53 +0000 (10:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:21:53 +0000 (10:21 -0500)

Trivial merge