Merge tag 'v1.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:07:37 +0000 (16:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:07:37 +0000 (16:07 -0400)
Version 1.1.0


Trivial merge