Merge tag 'v1.0.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Aug 2014 18:49:54 +0000 (14:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Aug 2014 18:49:54 +0000 (14:49 -0400)
Version 1.0.2


Trivial merge