Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Nov 2015 19:23:14 +0000 (14:23 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Nov 2015 19:23:14 +0000 (14:23 -0500)

Trivial merge