Merge branch 'hotfix/0.3.2' v0.3.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Dec 2015 18:37:08 +0000 (13:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 11 Dec 2015 18:37:08 +0000 (13:37 -0500)

Trivial merge