Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Jun 2015 16:59:55 +0000 (12:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Jun 2015 16:59:55 +0000 (12:59 -0400)

Trivial merge