Merge branch 'hotfix/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:23 +0000 (14:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 3 Feb 2017 19:12:23 +0000 (14:12 -0500)

Trivial merge