Merge branch 'release/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 14:47:54 +0000 (09:47 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 14:47:54 +0000 (09:47 -0500)

Trivial merge