Merge tag 'v1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 2 Feb 2017 19:38:08 +0000 (14:38 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 2 Feb 2017 19:38:08 +0000 (14:38 -0500)
verison 1.0.2


Trivial merge