Merge tag 'v1.0.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 13:16:51 +0000 (09:16 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 13:16:51 +0000 (09:16 -0400)
Update to new version for testing


Trivial merge