Merge tag 'v1.6.29' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:37:45 +0000 (11:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Mar 2017 15:37:45 +0000 (11:37 -0400)
Version 1.6.29


Trivial merge