Merge branch 'release/1.1.2' v1.1.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 20:02:21 +0000 (16:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Mar 2015 20:02:21 +0000 (16:02 -0400)

Trivial merge