Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:24:45 +0000 (14:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:24:45 +0000 (14:24 -0400)
Version 1.0.2


Trivial merge