Merge branch 'hotfix/1.0.5' master v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:09:23 +0000 (13:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 18:09:23 +0000 (13:09 -0500)

Trivial merge