Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:29 +0000 (17:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:29 +0000 (17:57 -0400)

Trivial merge