Merge branch 'hotfix/0.1.2' v0.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Dec 2015 21:32:34 +0000 (16:32 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Dec 2015 21:32:34 +0000 (16:32 -0500)

Trivial merge