Merge tag 'v2.5.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:41 +0000 (12:40 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:40:41 +0000 (12:40 -0400)
Updated to 2.5.5


Trivial merge