Merge tag '1.0.2' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:33 +0000 (14:41 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:33 +0000 (14:41 -0400)
version 1.0.2


Trivial merge