Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:30 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:24:30 +0000 (14:24 -0500)

Trivial merge