Merge branch 'hotfix/0.2.3' v0.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:29:03 +0000 (16:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 2 Dec 2015 21:29:03 +0000 (16:29 -0500)

Trivial merge