Merge tag '1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:07:14 +0000 (11:07 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 16:07:14 +0000 (11:07 -0500)
version 1.0.2


Trivial merge