Merge branch 'release/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 30 Dec 2015 16:54:36 +0000 (11:54 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 30 Dec 2015 16:54:36 +0000 (11:54 -0500)

Trivial merge