Merge branch 'hotfix/1.0.33' v1.0.33
authorSteve Sutton <ssutton@gmail.com>
Sun, 11 Sep 2016 00:51:57 +0000 (20:51 -0400)
committerSteve Sutton <ssutton@gmail.com>
Sun, 11 Sep 2016 00:51:57 +0000 (20:51 -0400)

Trivial merge