Merge tag 'v2.7.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:39:42 +0000 (09:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:39:42 +0000 (09:39 -0400)
Version 2.7.0


Trivial merge