Merge tag 'v2.5.3' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:09:28 +0000 (11:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Aug 2016 15:09:28 +0000 (11:09 -0400)
Version 2.5.3


Trivial merge