Merge branch 'release/1.5.6' v1.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 18:12:57 +0000 (13:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 15 Nov 2016 18:12:57 +0000 (13:12 -0500)

Trivial merge