Merge branch 'release/1.0.9' v1.0.9
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 16:38:47 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 16:38:47 +0000 (12:38 -0400)

Trivial merge