Merge branch 'hotfix/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:11 +0000 (13:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:11 +0000 (13:52 -0500)

Trivial merge