Merge branch 'release/1.5.8' v1.5.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Dec 2016 15:03:25 +0000 (10:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Dec 2016 15:03:25 +0000 (10:03 -0500)

Trivial merge