Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:42 +0000 (15:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:30:42 +0000 (15:30 -0400)
Version 1.0.2


Trivial merge