Merge tag 'v1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:50:04 +0000 (10:50 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Jun 2016 14:50:04 +0000 (10:50 -0400)
version 1.0.2


Trivial merge