Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:39 +0000 (12:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:39 +0000 (12:53 -0400)
Version 1.0.5


Trivial merge