Merge branch 'release/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 18:47:36 +0000 (14:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 18:47:36 +0000 (14:47 -0400)

Trivial merge