Merge branch 'release/1.1.1' v1.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 16:31:19 +0000 (11:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Jan 2015 16:31:19 +0000 (11:31 -0500)

Trivial merge