Merge branch 'release/2.5.5' v2.5.5
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:33 +0000 (12:40 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:33 +0000 (12:40 -0400)

Trivial merge