Merge branch 'release/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 9 Jul 2015 16:18:05 +0000 (12:18 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 9 Jul 2015 16:18:05 +0000 (12:18 -0400)

Trivial merge