Merge tag 'v1.1.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 17:20:50 +0000 (12:20 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 17:20:50 +0000 (12:20 -0500)
Version 1.1.0


Trivial merge