Merge tag 'v1.0.6' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:11 +0000 (10:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:11 +0000 (10:56 -0400)
Test updte


Trivial merge