Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jan 2016 13:42:48 +0000 (08:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jan 2016 13:42:48 +0000 (08:42 -0500)
version 1.0.2


Trivial merge