Merge branch 'hotfix/0.3.6' v0.3.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:52:57 +0000 (12:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:52:57 +0000 (12:52 -0500)

Trivial merge