Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:53:09 +0000 (11:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 15:53:09 +0000 (11:53 -0400)

Trivial merge