Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:10 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:51:10 +0000 (11:51 -0500)

Trivial merge