Merge tag 'v1.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:29:53 +0000 (11:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:29:53 +0000 (11:29 -0400)
Version 1.1.0


Trivial merge