Merge branch 'release/2.5.3' v2.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:09:20 +0000 (11:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:09:20 +0000 (11:09 -0400)

Trivial merge