Merge branch 'hotfix/1.0.31' v1.0.31 v1.0.32
authorIan Weller <ian@gaslightmedia.com>
Fri, 2 Sep 2016 17:30:33 +0000 (13:30 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 2 Sep 2016 17:30:33 +0000 (13:30 -0400)

Trivial merge