Merge branch 'release/2.5.6' v2.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:08:47 +0000 (14:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:08:47 +0000 (14:08 -0400)

Trivial merge