Merge branch 'hotfix/1.2.31' v1.2.31
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:10:07 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:10:07 +0000 (12:10 -0400)

Trivial merge