Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Jan 2017 18:29:57 +0000 (13:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Jan 2017 18:29:57 +0000 (13:29 -0500)

Trivial merge