Merge tag 'v1.2.29' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:11 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 3 Aug 2016 12:25:11 +0000 (08:25 -0400)
Version 1.2.29


Trivial merge