Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:27 +0000 (11:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:27 +0000 (11:28 -0500)

Trivial merge