Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 14:43:06 +0000 (09:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 14:43:06 +0000 (09:43 -0500)

Trivial merge