Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jan 2016 13:42:15 +0000 (08:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jan 2016 13:42:15 +0000 (08:42 -0500)

Trivial merge