Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:39 +0000 (17:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 21:57:39 +0000 (17:57 -0400)
Version 1.0.5


Trivial merge