Merge tag 'v1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 18:18:45 +0000 (14:18 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 18:18:45 +0000 (14:18 -0400)
version 1.0.2


Trivial merge