Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:19:57 +0000 (13:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:19:57 +0000 (13:19 -0500)

Trivial merge