Merge tag 'v1.0.2' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 14:48:18 +0000 (09:48 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jan 2016 14:48:18 +0000 (09:48 -0500)
version 1.0.2


Trivial merge