Merge branch 'release/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 5 May 2017 17:47:34 +0000 (13:47 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 5 May 2017 17:47:34 +0000 (13:47 -0400)

Trivial merge