Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 15:52:34 +0000 (10:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 15:52:34 +0000 (10:52 -0500)

Trivial merge