Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Sep 2015 19:55:43 +0000 (15:55 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 9 Sep 2015 19:55:43 +0000 (15:55 -0400)

Trivial merge