Merge branch 'hotfix/1.1.4'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:18 +0000 (14:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:18 +0000 (14:07 -0500)

Trivial merge