Merge tag 'v1.1.1' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:17:54 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 20:17:54 +0000 (16:17 -0400)
Version 1.1.1


Trivial merge