Merge tag 'v2.6.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:56 +0000 (13:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Sep 2016 17:34:56 +0000 (13:34 -0400)
Version 2.6.0


Trivial merge