Merge tag 'v1.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Oct 2014 20:06:56 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Oct 2014 20:06:56 +0000 (16:06 -0400)
Version 1.1


Trivial merge