Merge branch 'hotfix/0.3.7' v0.3.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jan 2016 18:50:44 +0000 (13:50 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jan 2016 18:50:44 +0000 (13:50 -0500)

Trivial merge