Merge branch 'hotfix/1.1.4' v1.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 18:04:21 +0000 (13:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 18:04:21 +0000 (13:04 -0500)

Trivial merge