Merge branch 'release/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:37:59 +0000 (15:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Dec 2016 20:37:59 +0000 (15:37 -0500)

Trivial merge